diff --git a/.gitignore b/.gitignore
index 9398a26..0c0b5c6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,4 @@
 .project
 .maven
 bin
-build
\ No newline at end of file
+build
diff --git a/java/base/.classpath b/java/base/.classpath
deleted file mode 100644
index 1b39b2d..0000000
--- a/java/base/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry kind="src" path="src/main/resource"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/java/sound/.classpath b/java/sound/.classpath
deleted file mode 100644
index 4828d2a..0000000
--- a/java/sound/.classpath
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src/main/java"/>
-	<classpathentry exported="true" kind="src" path="/java.base"/>
-	<classpathentry exported="true" kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry exported="true" kind="con" path="org.springsource.ide.eclipse.gradle.classpathcontainer"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
diff --git a/java/sound/build.xml b/java/sound/build.xml
deleted file mode 100644
index dbf0eb1..0000000
--- a/java/sound/build.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<project default="jar" name="Build file for Project Shoutcast">
-	<!-- All -->
-	<target name="all" depends="javadoc, jar, launch4j"></target>
-	
-	<!-- Javadoc -->
-	<target name="javadoc">
-		<javadoc access="private" author="true" classpath="" destdir="doc" nodeprecated="false" nodeprecatedlist="false" noindex="false" nonavbar="false" notree="false" packagenames="mimis.exception.macro,mimis.device.network,wiiusej,mimis.application.itunes,mimis.exception.util,mimis.device.javainput,wiiusej.wiiusejevents,wiiusej.wiiusejevents.utils,mimis.util.swing,mimis.exception.worker,mimis.application.lirc,mimis.application.cmd.windows.winamp,wiiusej.values,mimis.exception.event,mimis.device.lirc.remote,mimis.device.panel,mimis.exception.device,mimis.exception.button,mimis.application.robot,mimis.application.lirc.ipod,mimis.exception.task.action,mimis.exception.application,wiiusej.wiiusejevents.wiiuseapievents,mimis.application.cmd.windows.gomplayer,mimis.application.mpc,org.wiigee.logic,mimis.device.lirc,mimis.sequence,mimis.manager,org.wiigee.util,mimis.event,mimis.application.cmd.windows.wmp,mimis.value,mimis.device.javainput.extreme3d,mimis.event.router,mimis.application.cmd,mimis.worker,org.wiigee.event,mimis.device.wiimote,mimis.device.wiimote.gesture.event,wiiusej.wiiusejevents.physicalevents,mimis.util.multiplexer,mimis,org.wiigee.control,mimis.exception.device.javainput,mimis.util,mimis.application.cmd.windows,com.dt.iTunesController,org.wiigee.device,mimis.application.vlc,mimis.device.wiimote.gesture,mimis.device.jintellitype,mimis.event.feedback,mimis.device,org.wiigee.filter,mimis.exception.application.windows,mimis.application,mimis.sequence.state,mimis.device.javainput.rumblepad,com.melloware.jintellitype,mimis.exception.event.router,mimis.exception.task,mimis.exception" source="1.6" sourcepath="src" splitindex="true" use="true" version="true" />
-	</target>
-
-	<!-- Jar -->
-	<target name="jar">
-		<property name="jar.dir" value="." />
-		<jar destfile="${jar.dir}/stream.jar" filesetmanifest="mergewithoutmain">
-			<manifest>
-				<attribute name="Main-Class" value="udp.StreamClient" />
-				<attribute name="Class-Path" value="." />
-			</manifest>
-			<fileset dir="bin" />
-			<!--zipfileset excludes="META-INF/*.SF" src="lib/commons-logging-1.1.1.jar" /-->
-		</jar>
-		<!--copy todir="${jar.dir}">
-			<fileset dir=".">
-				<include name="*.dll" />
-				<include name="*.exe" />
-			</fileset>
-		</copy-->
-	</target>
-
-	<!-- Launch4j -->
-	<target name="launch4j" depends="jar">
-		<property name="launch4j.dir" location="C:\Program Files (x86)\Launch4j" />
-		<path id="launch4j">
-			<pathelement location="${launch4j.dir}/launch4j.jar" />
-			<pathelement location="${launch4j.dir}/lib/xstream.jar" />
-		</path>
-		<taskdef name="launch4j" classname="net.sf.launch4j.ant.Launch4jTask">
-			<classpath refid="launch4j" />
-		</taskdef>
-		<launch4j configFile="launch4j.xml" />
-		<delete file="launch4j.log" />
-	</target>
-</project>
diff --git a/java/sound/launch4j.xml b/java/sound/launch4j.xml
deleted file mode 100644
index 548e148..0000000
--- a/java/sound/launch4j.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<launch4jConfig>
-  <dontWrapJar>false</dontWrapJar>
-  <headerType>gui</headerType>
-  <jar>stream.jar</jar>
-  <outfile>stream.exe</outfile>
-  <errTitle></errTitle>
-  <cmdLine></cmdLine>
-  <chdir></chdir>
-  <priority>normal</priority>
-  <downloadUrl>http://java.com/download</downloadUrl>
-  <supportUrl></supportUrl>
-  <customProcName>false</customProcName>
-  <stayAlive>false</stayAlive>
-  <manifest></manifest>
-  <icon></icon>
-  <jre>
-    <path></path>
-    <minVersion>1.6.0</minVersion>
-    <maxVersion></maxVersion>
-    <jdkPreference>preferJre</jdkPreference>
-  </jre>
-</launch4jConfig>
\ No newline at end of file
diff --git a/java/sound/pipe.dll b/java/sound/pipe.dll
deleted file mode 100644
index 8a948e6..0000000
Binary files a/java/sound/pipe.dll and /dev/null differ
diff --git a/java/sound/lame.exe b/java/sound/src/main/resources/lame.exe
similarity index 100%
rename from java/sound/lame.exe
rename to java/sound/src/main/resources/lame.exe
diff --git a/java/sound/libgomp-1.dll b/java/sound/src/main/resources/libgomp-1.dll
similarity index 100%
rename from java/sound/libgomp-1.dll
rename to java/sound/src/main/resources/libgomp-1.dll
diff --git a/java/sound/libmad.dll b/java/sound/src/main/resources/libmad.dll
similarity index 100%
rename from java/sound/libmad.dll
rename to java/sound/src/main/resources/libmad.dll
diff --git a/java/sound/libmp3lame.dll b/java/sound/src/main/resources/libmp3lame.dll
similarity index 100%
rename from java/sound/libmp3lame.dll
rename to java/sound/src/main/resources/libmp3lame.dll
diff --git a/java/sound/play.exe b/java/sound/src/main/resources/play.exe
similarity index 100%
rename from java/sound/play.exe
rename to java/sound/src/main/resources/play.exe
diff --git a/java/sound/pthreadgc2.dll b/java/sound/src/main/resources/pthreadgc2.dll
similarity index 100%
rename from java/sound/pthreadgc2.dll
rename to java/sound/src/main/resources/pthreadgc2.dll
diff --git a/java/sound/sox.exe b/java/sound/src/main/resources/sox.exe
similarity index 100%
rename from java/sound/sox.exe
rename to java/sound/src/main/resources/sox.exe
diff --git a/java/sound/soxi.exe b/java/sound/src/main/resources/soxi.exe
similarity index 100%
rename from java/sound/soxi.exe
rename to java/sound/src/main/resources/soxi.exe
diff --git a/java/sound/stream.exe b/java/sound/src/main/resources/stream.exe
similarity index 100%
rename from java/sound/stream.exe
rename to java/sound/src/main/resources/stream.exe
diff --git a/java/sound/txt/keuze.txt b/java/sound/src/main/resources/txt/keuze.txt
similarity index 100%
rename from java/sound/txt/keuze.txt
rename to java/sound/src/main/resources/txt/keuze.txt
diff --git a/java/sound/txt/mp3 b/java/sound/src/main/resources/txt/mp3
similarity index 100%
rename from java/sound/txt/mp3
rename to java/sound/src/main/resources/txt/mp3
diff --git a/java/sound/txt/options b/java/sound/src/main/resources/txt/options
similarity index 100%
rename from java/sound/txt/options
rename to java/sound/src/main/resources/txt/options
diff --git a/java/sound/txt/short b/java/sound/src/main/resources/txt/short
similarity index 100%
rename from java/sound/txt/short
rename to java/sound/src/main/resources/txt/short
diff --git a/java/sound/txt/testfiles.txt b/java/sound/src/main/resources/txt/testfiles.txt
similarity index 100%
rename from java/sound/txt/testfiles.txt
rename to java/sound/src/main/resources/txt/testfiles.txt
diff --git a/java/sound/wget.exe b/java/sound/src/main/resources/wget.exe
similarity index 100%
rename from java/sound/wget.exe
rename to java/sound/src/main/resources/wget.exe
diff --git a/java/sound/zlib1.dll b/java/sound/src/main/resources/zlib1.dll
similarity index 100%
rename from java/sound/zlib1.dll
rename to java/sound/src/main/resources/zlib1.dll
diff --git a/java/sound/stream.bat b/java/sound/stream.bat
deleted file mode 100644
index 21afc51..0000000
--- a/java/sound/stream.bat
+++ /dev/null
@@ -1 +0,0 @@
-java -classpath bin udp.StreamClient 234.5.6.7 4567
\ No newline at end of file
diff --git a/java/sound/stream.jar b/java/sound/stream.jar
deleted file mode 100644
index 1d8bbdc..0000000
Binary files a/java/sound/stream.jar and /dev/null differ