diff --git a/java/.classpath b/java/.classpath
index ea13487..6017bc4 100644
--- a/java/.classpath
+++ b/java/.classpath
@@ -1,12 +1,15 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+	<classpathentry kind="src" path="src">
 		<attributes>
 			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Mimis/native"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="native"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6">
+		<attributes>
+			<attribute name="org.eclipse.jdt.launching.CLASSPATH_ATTR_LIBRARY_PATH_ENTRY" value="Mimis"/>
+		</attributes>
+	</classpathentry>
 	<classpathentry kind="lib" path="resource"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.1.1.jar"/>
 	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
diff --git a/java/jar/native/DelcomDLL.dll b/java/DelcomDLL.dll
similarity index 100%
rename from java/jar/native/DelcomDLL.dll
rename to java/DelcomDLL.dll
diff --git a/java/jar/native/NativeCall.dll b/java/NativeCall.dll
similarity index 100%
rename from java/jar/native/NativeCall.dll
rename to java/NativeCall.dll
diff --git a/java/native/WiiUseJ.dll b/java/WiiUseJ.dll
similarity index 100%
rename from java/native/WiiUseJ.dll
rename to java/WiiUseJ.dll
diff --git a/java/native/jacob-1.15-M3-x86.dll b/java/jacob-1.15-M3-x86.dll
similarity index 100%
rename from java/native/jacob-1.15-M3-x86.dll
rename to java/jacob-1.15-M3-x86.dll
diff --git a/java/native/DelcomDLL.dll b/java/jar/DelcomDLL.dll
similarity index 100%
rename from java/native/DelcomDLL.dll
rename to java/jar/DelcomDLL.dll
diff --git a/java/native/jintellitype.dll b/java/jintellitype.dll
similarity index 100%
rename from java/native/jintellitype.dll
rename to java/jintellitype.dll
diff --git a/java/native/jxinput.dll b/java/jxinput.dll
similarity index 100%
rename from java/native/jxinput.dll
rename to java/jxinput.dll
diff --git a/java/jar/native/list.exe b/java/list.exe
similarity index 100%
rename from java/jar/native/list.exe
rename to java/list.exe
diff --git a/java/native/NativeCall.dll b/java/native/NativeCall.dll
deleted file mode 100644
index 6e2cad1..0000000
Binary files a/java/native/NativeCall.dll and /dev/null differ
diff --git a/java/native/list.exe b/java/native/list.exe
deleted file mode 100644
index 17d5b4f..0000000
Binary files a/java/native/list.exe and /dev/null differ
diff --git a/java/native/wiiscan.exe b/java/native/wiiscan.exe
deleted file mode 100644
index 9e9e443..0000000
Binary files a/java/native/wiiscan.exe and /dev/null differ
diff --git a/java/native/wiiuse.dll b/java/native/wiiuse.dll
deleted file mode 100644
index 260aeb0..0000000
Binary files a/java/native/wiiuse.dll and /dev/null differ
diff --git a/java/native/wpcom.dll b/java/native/wpcom.dll
deleted file mode 100644
index 3d8f765..0000000
Binary files a/java/native/wpcom.dll and /dev/null differ
diff --git a/java/src/mimis/application/cmd/windows/WindowsApplication.java b/java/src/mimis/application/cmd/windows/WindowsApplication.java
index 6759203..529a653 100644
--- a/java/src/mimis/application/cmd/windows/WindowsApplication.java
+++ b/java/src/mimis/application/cmd/windows/WindowsApplication.java
@@ -38,6 +38,13 @@ public abstract class WindowsApplication extends CMDApplication {
         }
     }
 
+    public boolean active() {
+        if (!active) {
+            handle = Windows.findWindow(name, null);
+        }
+        return super.active();
+    }
+
     public void deactivate() throws DeactivateException {
         try {
             VBScript.terminate(program);
diff --git a/java/src/mimis/util/Multiplexer.java b/java/src/mimis/util/Multiplexer.java
index 9840b04..cd48c68 100644
--- a/java/src/mimis/util/Multiplexer.java
+++ b/java/src/mimis/util/Multiplexer.java
@@ -22,7 +22,7 @@ public class Multiplexer extends Worker {
         this.signalListener = signalListener;
     }
 
-    public void add(Object object) {
+    public synchronized void add(Object object) {
         if (this.object == null) {
             signalListener.add(Signal.BEGIN, object);
             this.object = object;
@@ -34,20 +34,17 @@ public class Multiplexer extends Worker {
             }
         } else if (this.object.equals(object)) {
             end = false;
-            synchronized (this) {
-                notifyAll();            
-            }
+            notifyAll();
         } else {
             end = true;
             synchronized (this) {
-                notifyAll();            
+                notifyAll();
             }
             add(object);
         }
     }
 
     protected void work() {
-        log.debug("Multiplexer work");
         try {
             synchronized (this) {
                 wait(TIMEOUT);
diff --git a/java/src/mimis/util/Native.java b/java/src/mimis/util/Native.java
index 4e0d161..2dab37a 100644
--- a/java/src/mimis/util/Native.java
+++ b/java/src/mimis/util/Native.java
@@ -8,7 +8,7 @@ import java.util.Scanner;
 
 public class Native {
     public static int getHandle(String title) throws IOException {
-        String command = String.format("native/list.exe w");
+        String command = String.format("list.exe w");
         Process process = Runtime.getRuntime().exec(command);
         Scanner scanner = new Scanner(process.getInputStream());
         scanner.nextLine();
@@ -27,7 +27,7 @@ public class Native {
     }
 
     public static String getProgram(int processId) throws IOException {
-        String command = String.format("native/list.exe p");
+        String command = String.format("list.exe p");
         Process process = Runtime.getRuntime().exec(command);
         Scanner scanner = new Scanner(process.getInputStream());
         scanner.nextLine();
diff --git a/java/jar/native/wiiscan.exe b/java/wiiscan.exe
similarity index 100%
rename from java/jar/native/wiiscan.exe
rename to java/wiiscan.exe
diff --git a/java/jar/native/wpcom.dll b/java/wpcom.dll
similarity index 100%
rename from java/jar/native/wpcom.dll
rename to java/wpcom.dll