diff --git a/LibusbJava/build.xml b/LibusbJava/build.xml
index 56252f2..5d7177b 100644
--- a/LibusbJava/build.xml
+++ b/LibusbJava/build.xml
@@ -23,6 +23,7 @@
 	<property name="LIB_CCFLAGS_WIN" value="-I&quot;C:/Program Files/Java/jdk${java.version}/include&quot;
 											-I&quot;C:/Program Files/Java/jdk${java.version}/include/win32&quot;
 											-I${basedir}
+											-I${basedir}/libusb/include
 											-Wall 
 											-Wno-write-strings
 											-D_JNI_IMPLEMENTATION_ 
@@ -35,8 +36,8 @@
 											${basedir}/LibusbJava.cpp
 											${ver_info}
 											-o ${out_dir}/LibusbJava-1_0.dll
-											-L${basedir}/MinGW64/static
-											-L${basedir}/MinGW32/static
+											-L${basedir}/libusb/MinGW64/static
+											-L${basedir}/libusb/MinGW32/static
 											-lusb-1.0" />
 	<property name="APP_CCFLAGS_WIN" value="-Wall
 											-Wno-write-strings
@@ -55,7 +56,6 @@
 											${basedir}/test/LibusbJavaTest.cpp
 											-o
 											${Unit-Test Executable}
-											-L${basedir}/MinGW64/static
 											-L&quot;C:/Program Files/Java/jdk${java.version}/lib&quot;" />
 
 	<property name="LIB_CCFLAGS_LIN" value="-Wno-write-strings
diff --git a/LibusbJava/MinGW32/dll/libusb-1.0.dll.a b/LibusbJava/libusb/MinGW32/dll/libusb-1.0.dll.a
similarity index 100%
rename from LibusbJava/MinGW32/dll/libusb-1.0.dll.a
rename to LibusbJava/libusb/MinGW32/dll/libusb-1.0.dll.a
diff --git a/LibusbJava/MinGW32/static/libusb-1.0.a b/LibusbJava/libusb/MinGW32/static/libusb-1.0.a
similarity index 100%
rename from LibusbJava/MinGW32/static/libusb-1.0.a
rename to LibusbJava/libusb/MinGW32/static/libusb-1.0.a
diff --git a/LibusbJava/MinGW64/dll/libusb-1.0.dll.a b/LibusbJava/libusb/MinGW64/dll/libusb-1.0.dll.a
similarity index 100%
rename from LibusbJava/MinGW64/dll/libusb-1.0.dll.a
rename to LibusbJava/libusb/MinGW64/dll/libusb-1.0.dll.a
diff --git a/LibusbJava/MinGW64/static/libusb-1.0.a b/LibusbJava/libusb/MinGW64/static/libusb-1.0.a
similarity index 100%
rename from LibusbJava/MinGW64/static/libusb-1.0.a
rename to LibusbJava/libusb/MinGW64/static/libusb-1.0.a
diff --git a/LibusbJava/libusb.h b/LibusbJava/libusb/include/libusb.h
similarity index 100%
rename from LibusbJava/libusb.h
rename to LibusbJava/libusb/include/libusb.h
diff --git a/LibusbJava/libusb-1.0.def b/LibusbJava/libusb/libusb-1.0.def
similarity index 100%
rename from LibusbJava/libusb-1.0.def
rename to LibusbJava/libusb/libusb-1.0.def