diff --git a/.gitignore b/.gitignore
index ecd41d5..f3ff31b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,9 @@
 bin
-Debug/src
-Release/src
 .gradle
 .settings
 build
+<<<<<<< HEAD
 /cpp/pipe/Release/src
+=======
+src
+>>>>>>> 1b005c69f5ba5b443ef5addc6aad13236196f3dc
diff --git a/cpp/mimis/.cproject b/cpp/mimis/.cproject
index ea31a1a..54a4c4d 100644
--- a/cpp/mimis/.cproject
+++ b/cpp/mimis/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -21,8 +19,6 @@
 					<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
 					<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
-					<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
 				</extensions>
 			</storageModule>
 			<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -30,7 +26,7 @@
 					<folderInfo id="cdt.managedbuild.config.gnu.mingw.exe.debug.850231290." name="/" resourcePath="">
 						<toolChain id="cdt.managedbuild.toolchain.gnu.mingw.exe.debug.1828925779" name="MinGW GCC" superClass="cdt.managedbuild.toolchain.gnu.mingw.exe.debug">
 							<targetPlatform id="cdt.managedbuild.target.gnu.platform.mingw.exe.debug.759162706" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.mingw.exe.debug"/>
-							<builder buildPath="${workspace_loc:/Mimis library/Debug}" id="cdt.managedbuild.target.gnu.builder.base.1712709797" superClass="cdt.managedbuild.target.gnu.builder.base"/>
+							<builder buildPath="${workspace_loc:/Mimis library/Debug}" id="org.eclipse.cdt.build.core.internal.builder.101482938" superClass="org.eclipse.cdt.build.core.internal.builder"/>
 							<tool id="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug.2073686457" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.mingw.exe.debug">
 								<inputType id="cdt.managedbuild.tool.gnu.assembler.input.589684161" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
 							</tool>
@@ -58,6 +54,10 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug.2031822380" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.debug">
 								<option defaultValue="true" id="gnu.cpp.link.option.shared.772342780" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.flags.1293821467" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.2056105731" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.nostdlibs.1324266543" name="No startup or default libs (-nostdlib)" superClass="gnu.cpp.link.option.nostdlibs" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.nodeflibs.1105061355" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.cpp.link.option.nodeflibs" value="false" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.118183058" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -123,6 +123,10 @@
 							</tool>
 							<tool id="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release.1036255767" name="MinGW C++ Linker" superClass="cdt.managedbuild.tool.gnu.cpp.linker.mingw.exe.release">
 								<option defaultValue="true" id="gnu.cpp.link.option.shared.1672917672" name="Shared (-shared)" superClass="gnu.cpp.link.option.shared" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.flags.837724797" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.559201662" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.nostdlibs.863245435" name="No startup or default libs (-nostdlib)" superClass="gnu.cpp.link.option.nostdlibs" value="false" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.nodeflibs.1983716612" name="Do not use default libraries (-nodefaultlibs)" superClass="gnu.cpp.link.option.nodeflibs" value="false" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1374294851" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --git a/cpp/mimis/Debug/copy.bat b/cpp/mimis/Debug/copy.bat
index 1a0d3a1..5cf0cbe 100644
--- a/cpp/mimis/Debug/copy.bat
+++ b/cpp/mimis/Debug/copy.bat
@@ -1 +1 @@
-copy mimis.dll ..\..\..\java\mimis.dll
\ No newline at end of file
+copy mimis.dll ..\..\..\java\mimis\mimis.dll
\ No newline at end of file
diff --git a/cpp/mimis/Release/copy.bat b/cpp/mimis/Release/copy.bat
index 1a0d3a1..5cf0cbe 100644
--- a/cpp/mimis/Release/copy.bat
+++ b/cpp/mimis/Release/copy.bat
@@ -1 +1 @@
-copy mimis.dll ..\..\..\java\mimis.dll
\ No newline at end of file
+copy mimis.dll ..\..\..\java\mimis\mimis.dll
\ No newline at end of file
diff --git a/cpp/mimis/Release/mimis.dll b/cpp/mimis/Release/mimis.dll
deleted file mode 100644
index 25ef12a..0000000
Binary files a/cpp/mimis/Release/mimis.dll and /dev/null differ
diff --git a/cpp/wiipair/Debug/wiipair.exe b/cpp/wiipair/Debug/wiipair.exe
index d8002b3..212c5bb 100644
Binary files a/cpp/wiipair/Debug/wiipair.exe and b/cpp/wiipair/Debug/wiipair.exe differ
diff --git a/cpp/wiiscan/lib/wiiuse.lib b/cpp/wiiscan/lib/wiiuse.lib
index d0408e2..b3a2b3b 100644
Binary files a/cpp/wiiscan/lib/wiiuse.lib and b/cpp/wiiscan/lib/wiiuse.lib differ
diff --git a/cpp/wiiuse/Debug/copy.bat b/cpp/wiiuse/Debug/copy.bat
index f33aec8..7add6c4 100644
--- a/cpp/wiiuse/Debug/copy.bat
+++ b/cpp/wiiuse/Debug/copy.bat
@@ -1,5 +1,5 @@
-copy ..\src\wiiuse.h ..\..\WiiuseJ\include\wiiuse.h
-copy ..\src\wiiuse.h ..\..\Wiiscan\include\wiiuse.h
-copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib
-copy wiiuse.lib ..\..\Wiiscan\lib\wiiuse.lib
-copy wiiuse.dll ..\..\Mimis\wiiuse.dll
\ No newline at end of file
+copy ..\src\wiiuse.h ..\..\wiiusej\include\wiiuse.h
+copy ..\src\wiiuse.h ..\..\wiiscan\include\wiiuse.h
+copy wiiuse.lib ..\..\wiiusej\lib\wiiuse.lib
+copy wiiuse.lib ..\..\wiiscan\lib\wiiuse.lib
+copy wiiuse.dll ..\..\..\java\wiiusej\wiiuse.dll
\ No newline at end of file
diff --git a/cpp/wiiuse/Debug/wiiuse.dll b/cpp/wiiuse/Debug/wiiuse.dll
deleted file mode 100644
index 4f18233..0000000
Binary files a/cpp/wiiuse/Debug/wiiuse.dll and /dev/null differ
diff --git a/cpp/wiiuse/Debug/wiiuse.lib b/cpp/wiiuse/Debug/wiiuse.lib
deleted file mode 100644
index d0408e2..0000000
Binary files a/cpp/wiiuse/Debug/wiiuse.lib and /dev/null differ
diff --git a/cpp/wiiuse/Release/copy.bat b/cpp/wiiuse/Release/copy.bat
index f33aec8..7add6c4 100644
--- a/cpp/wiiuse/Release/copy.bat
+++ b/cpp/wiiuse/Release/copy.bat
@@ -1,5 +1,5 @@
-copy ..\src\wiiuse.h ..\..\WiiuseJ\include\wiiuse.h
-copy ..\src\wiiuse.h ..\..\Wiiscan\include\wiiuse.h
-copy wiiuse.lib ..\..\WiiuseJ\lib\wiiuse.lib
-copy wiiuse.lib ..\..\Wiiscan\lib\wiiuse.lib
-copy wiiuse.dll ..\..\Mimis\wiiuse.dll
\ No newline at end of file
+copy ..\src\wiiuse.h ..\..\wiiusej\include\wiiuse.h
+copy ..\src\wiiuse.h ..\..\wiiscan\include\wiiuse.h
+copy wiiuse.lib ..\..\wiiusej\lib\wiiuse.lib
+copy wiiuse.lib ..\..\wiiscan\lib\wiiuse.lib
+copy wiiuse.dll ..\..\..\java\wiiusej\wiiuse.dll
\ No newline at end of file
diff --git a/cpp/wiiuse/Release/wiiuse.dll b/cpp/wiiuse/Release/wiiuse.dll
new file mode 100644
index 0000000..fe4770f
Binary files /dev/null and b/cpp/wiiuse/Release/wiiuse.dll differ
diff --git a/cpp/wiipair/lib/wiiuse.lib b/cpp/wiiuse/Release/wiiuse.lib
similarity index 89%
rename from cpp/wiipair/lib/wiiuse.lib
rename to cpp/wiiuse/Release/wiiuse.lib
index 6425e72..b3a2b3b 100644
Binary files a/cpp/wiipair/lib/wiiuse.lib and b/cpp/wiiuse/Release/wiiuse.lib differ
diff --git a/cpp/wiiusej/.cproject b/cpp/wiiusej/.cproject
index e199e3f..f3483d8 100644
--- a/cpp/wiiusej/.cproject
+++ b/cpp/wiiusej/.cproject
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<?fileVersion 4.0.0?>
-
-<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
+<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
 	<storageModule moduleId="org.eclipse.cdt.core.settings">
 		<cconfiguration id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616">
 			<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.mingw.so.debug.1025362616" moduleId="org.eclipse.cdt.core.settings" name="Debug">
@@ -65,8 +63,8 @@
 								<option id="gnu.cpp.link.option.libs.102697521" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="wiiuse"/>
 								</option>
-								<option id="gnu.cpp.link.option.flags.2098946116" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/>
-								<option id="gnu.cpp.link.option.strip.193866268" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.flags.2098946116" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.193866268" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.1307869739" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
@@ -141,8 +139,8 @@
 								<option id="gnu.cpp.link.option.libs.173366246" name="Libraries (-l)" superClass="gnu.cpp.link.option.libs" valueType="libs">
 									<listOptionValue builtIn="false" value="wiiuse"/>
 								</option>
-								<option id="gnu.cpp.link.option.flags.1334245987" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,--kill-at -static-libgcc" valueType="string"/>
-								<option id="gnu.cpp.link.option.strip.611886908" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="true" valueType="boolean"/>
+								<option id="gnu.cpp.link.option.flags.1334245987" name="Linker flags" superClass="gnu.cpp.link.option.flags" value="-Wl,-add-stdcall-alias -static-libgcc -static-libstdc++" valueType="string"/>
+								<option id="gnu.cpp.link.option.strip.611886908" name="Omit all symbol information (-s)" superClass="gnu.cpp.link.option.strip" value="false" valueType="boolean"/>
 								<inputType id="cdt.managedbuild.tool.gnu.cpp.linker.input.790138545" superClass="cdt.managedbuild.tool.gnu.cpp.linker.input">
 									<additionalInput kind="additionalinputdependency" paths="$(USER_OBJS)"/>
 									<additionalInput kind="additionalinput" paths="$(LIBS)"/>
diff --git a/cpp/wiiusej/Debug/copy.bat b/cpp/wiiusej/Debug/copy.bat
index 0e12087..8ce62ea 100644
--- a/cpp/wiiusej/Debug/copy.bat
+++ b/cpp/wiiusej/Debug/copy.bat
@@ -1 +1 @@
-copy wiiusej.dll ..\..\Mimis\wiiusej.dll
\ No newline at end of file
+copy wiiusej.dll  ..\..\..\java\wiiusej\wiiusej.dll
\ No newline at end of file
diff --git a/cpp/wiiusej/Debug/wiiusej.dll b/cpp/wiiusej/Debug/wiiusej.dll
deleted file mode 100644
index 9788def..0000000
Binary files a/cpp/wiiusej/Debug/wiiusej.dll and /dev/null differ
diff --git a/cpp/wiiusej/Release/copy.bat b/cpp/wiiusej/Release/copy.bat
index 0e12087..8ce62ea 100644
--- a/cpp/wiiusej/Release/copy.bat
+++ b/cpp/wiiusej/Release/copy.bat
@@ -1 +1 @@
-copy wiiusej.dll ..\..\Mimis\wiiusej.dll
\ No newline at end of file
+copy wiiusej.dll  ..\..\..\java\wiiusej\wiiusej.dll
\ No newline at end of file
diff --git a/cpp/wiiusej/Release/wiiusej.dll b/cpp/wiiusej/Release/wiiusej.dll
index d3b0cf5..c50c645 100644
Binary files a/cpp/wiiusej/Release/wiiusej.dll and b/cpp/wiiusej/Release/wiiusej.dll differ
diff --git a/cpp/wiiusej/lib/wiiuse.lib b/cpp/wiiusej/lib/wiiuse.lib
index 6425e72..b3a2b3b 100644
Binary files a/cpp/wiiusej/lib/wiiuse.lib and b/cpp/wiiusej/lib/wiiuse.lib differ
diff --git a/java/mimis/build.gradle b/java/mimis/build.gradle
index 3e21f84..c090ef3 100644
--- a/java/mimis/build.gradle
+++ b/java/mimis/build.gradle
@@ -18,4 +18,10 @@ jar {
 	manifest {
 		attributes 'Main-Class': mainClass
 	}
+	dependsOn configurations.runtime
+	from {
+		configurations.runtime.collect {
+			it.isDirectory() ? it : zipTree(it)
+		}
+	}
 }
\ No newline at end of file
diff --git a/java/mimis/mimis.dll b/java/mimis/mimis.dll
index 25ef12a..0056a24 100644
Binary files a/java/mimis/mimis.dll and b/java/mimis/mimis.dll differ
diff --git a/java/mimis/wiiuse.dll b/java/mimis/wiiuse.dll
index 24df528..fe4770f 100644
Binary files a/java/mimis/wiiuse.dll and b/java/mimis/wiiuse.dll differ
diff --git a/java/mimis/wiiusej.dll b/java/mimis/wiiusej.dll
index 0c30f4f..c50c645 100644
Binary files a/java/mimis/wiiusej.dll and b/java/mimis/wiiusej.dll differ
diff --git a/java/wiiusej/wiiuse.dll b/java/wiiusej/wiiuse.dll
new file mode 100644
index 0000000..fe4770f
Binary files /dev/null and b/java/wiiusej/wiiuse.dll differ
diff --git a/java/wiiusej/wiiusej.dll b/java/wiiusej/wiiusej.dll
new file mode 100644
index 0000000..c50c645
Binary files /dev/null and b/java/wiiusej/wiiusej.dll differ
diff --git a/vendor/wiiscan/0.90/Debug/wiiuse.dll b/vendor/wiiscan/0.90/Debug/wiiuse.dll
deleted file mode 100644
index a7e228c..0000000
Binary files a/vendor/wiiscan/0.90/Debug/wiiuse.dll and /dev/null differ
diff --git a/vendor/wiiscan/0.90/Lib/wiiuse.dll b/vendor/wiiscan/0.90/Lib/wiiuse.dll
deleted file mode 100644
index a7e228c..0000000
Binary files a/vendor/wiiscan/0.90/Lib/wiiuse.dll and /dev/null differ
diff --git a/vendor/wiiscan/0.90/Lib/wiiuse.lib b/vendor/wiiscan/0.90/Lib/wiiuse.lib
deleted file mode 100644
index 4f1b69b..0000000
Binary files a/vendor/wiiscan/0.90/Lib/wiiuse.lib and /dev/null differ
diff --git a/vendor/wiiscan/0.90/Release/wiiuse.dll b/vendor/wiiscan/0.90/Release/wiiuse.dll
deleted file mode 100644
index a7e228c..0000000
Binary files a/vendor/wiiscan/0.90/Release/wiiuse.dll and /dev/null differ