diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java b/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java
deleted file mode 100644
index 30eb590d..00000000
--- a/ultrasonic/src/main/java/org/moire/ultrasonic/domain/MusicFolder.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- This file is part of Subsonic.
-
- Subsonic is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- Subsonic is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Subsonic.  If not, see <http://www.gnu.org/licenses/>.
-
- Copyright 2009 (C) Sindre Mehus
- */
-package org.moire.ultrasonic.domain;
-
-/**
- * Represents a top level directory in which music or other media is stored.
- *
- * @author Sindre Mehus
- * @version $Id$
- */
-public class MusicFolder
-{
-
-	private final String id;
-	private final String name;
-
-	public MusicFolder(String id, String name)
-	{
-		this.id = id;
-		this.name = name;
-	}
-
-	public String getId()
-	{
-		return id;
-	}
-
-	public String getName()
-	{
-		return name;
-	}
-}
diff --git a/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt
new file mode 100644
index 00000000..a7e91d27
--- /dev/null
+++ b/ultrasonic/src/main/kotlin/org/moire/ultrasonic/domain/MusicFolder.kt
@@ -0,0 +1,9 @@
+package org.moire.ultrasonic.domain
+
+/**
+ * Represents a top level directory in which music or other media is stored.
+ */
+data class MusicFolder(
+        val id: String,
+        val name: String
+)