diff --git a/java/base/.project b/java/base/.project
index 86f9562..5825087 100644
--- a/java/base/.project
+++ b/java/base/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-	<name>java.base</name>
+	<name>base</name>
 	<comment></comment>
 	<projects>
 	</projects>
diff --git a/java/mimis/build.gradle b/java/mimis/build.gradle
index 4c39d47..386cffc 100644
--- a/java/mimis/build.gradle
+++ b/java/mimis/build.gradle
@@ -1,29 +1,59 @@
+apply plugin: 'java'
+apply plugin: 'maven'
+apply plugin: 'eclipse'
+
+task wrapper(type: Wrapper) {
+	gradleVersion = '2.2'
+}
+
 repositories {
+	maven {
+		url 'https://github.com/Boukefalos/mimis/raw/mvn-repo/'
+	}
 	maven {
 		url 'https://github.com/Boukefalos/wiigee/raw/mvn-repo/'
 	}
+	maven {
+		url 'https://github.com/Boukefalos/jlibcom/raw/mvn-repo/'
+	}
 	maven {
 		url 'https://github.com/Boukefalos/jlibitunes/raw/mvn-repo/'
 	}
+	maven {
+		url 'https://github.com/Boukefalos/jlibloader/raw/mvn-repo/'
+	}
+	maven {
+		url 'https://github.com/Boukefalos/jlibwiiuse/raw/mvn-repo/'
+	}
+	maven {
+		url 'https://github.com/Boukefalos/libwiiuse/raw/mvn-repo/'
+	}
+	maven {
+		url 'https://github.com/Boukefalos/jlibintellitype/raw/mvn-repo/'
+	}
+	maven {
+		url 'https://github.com/Boukefalos/jlibxinput/raw/mvn-repo/'
+	}
 	mavenCentral()
 }
 
 dependencies {
 	compile project(':base')
 
-	compile 'org.wiigee:wiigee:1.5.6'
-	compile 'com.dt:jlibitunes:0.3'
-
-	compile files('lib/jxinput.jar')
-	compile fileTree(dir: 'lib', include: '*.jar')
+	compile 'com.github.boukefalos:jlibmimis:0.1'
+	compile 'com.github.boukefalos:jlibitunes:0.3'
+	compile 'com.github.boukefalos:jlibwiiuse:0.12'
+	compile 'com.github.boukefalos:jlibintellitype:1.3.9'
+	compile 'com.github.boukefalos:jlibxinput:1.0'
 
 	compile 'commons-collections:commons-collections:3.+'
 	compile 'org.slf4j:slf4j-api:1.+'
 	compile 'org.slf4j:slf4j-log4j12:1.+'
-	compile 'com.melloware:jintellitype:1.+'
+	compile 'org.wiigee:wiigee:1.5.6'
 }
 
 jar {
+	from sourceSets.main.allSource
 	manifest {
 		attributes 'Main-Class': 'mimis.Main'
 	}
diff --git a/java/settings.gradle b/java/settings.gradle
index dde8df6..7bd51cb 100644
--- a/java/settings.gradle
+++ b/java/settings.gradle
@@ -1 +1 @@
-include 'base', 'mimis', 'wiiusej', 'sound'
\ No newline at end of file
+include 'base', 'mimis', 'test'
\ No newline at end of file
diff --git a/java/test/build.gradle b/java/test/build.gradle
new file mode 100644
index 0000000..0ce6a16
--- /dev/null
+++ b/java/test/build.gradle
@@ -0,0 +1,3 @@
+dependencies {
+
+}
\ No newline at end of file