diff --git a/build.xml b/build.xml
index b4cca64..31f096b 100644
--- a/build.xml
+++ b/build.xml
@@ -4,12 +4,9 @@
 
   <property name="src.dir" location="${basedir}/src"/>
   <property name="libs.dir" location="${basedir}/libs"/>
-  <property name="libs.osx64.dir" location="${libs.dir}/osx"/>
-  <property name="libs.lin32.dir" location="${libs.dir}/lin32"/>
-  <property name="libs.lin64.dir" location="${libs.dir}/lin64"/>
-  <property name="libs.win32.dir" location="${libs.dir}/win32"/>
-  <property name="libs.win64.dir" location="${libs.dir}/win64"/>
 
+  <property name="libs.pi.dir" location="${libs.dir}/pi"/>
+  
   <property name="lib.dir" location="${basedir}/lib"/>
   <property name="build.dir" location="${basedir}/build"/>
 
@@ -29,9 +26,9 @@
     <delete dir="${classes.dir}"/>
   </target>
 
-  <target name="all" depends="limelight-osx,limelight-lin64,limelight-win32,limelight-win64"/>
+  <target name="all" depends="limelight-pi"/>
 
-  <target name="limelight-osx" depends="init">
+  <target name="limelight-pi" depends="init">
     <!-- compile limelight -->
     <javac includeantruntime="false" destdir="${classes.dir}/src">
       <src path="${src.dir}"/>
@@ -42,7 +39,7 @@
     </javac>
 
     <!-- construct one-jar file -->
-    <one-jar destfile="${build.dir}/limelight-osx64.jar">
+    <one-jar destfile="${build.dir}/limelight-pi.jar">
       <manifest>
         <attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
       </manifest>
@@ -57,133 +54,9 @@
       </lib>
 
       <binlib>
-        <fileset dir="${libs.osx64.dir}" includes="*"/>
+        <fileset dir="${libs.pi.dir}" includes="*"/>
       </binlib>
     </one-jar>
   </target>
-  <target name="limelight-lin32" depends="init">
-    <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/src">
-      <src path="${src.dir}"/>
-      <classpath path="${build.dir}"/>
-      <classpath>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </classpath>
-    </javac>
-
-    <!-- construct one-jar file -->
-    <one-jar destfile="${build.dir}/limelight-lin32.jar">
-      <manifest>
-        <attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
-      </manifest>
-
-      <main>
-        <!-- construct limelight.jar -->
-        <fileset dir="${classes.dir}/src"/>
-      </main>
-
-      <lib>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </lib>
-
-      <binlib>
-        <fileset dir="${libs.lin32.dir}" includes="*"/>
-      </binlib>
-    </one-jar>
-  </target>
-
-  <target name="limelight-lin64" depends="init">
-    <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/src">
-      <src path="${src.dir}"/>
-      <classpath path="${build.dir}"/>
-      <classpath>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </classpath>
-    </javac>
-
-    <!-- construct one-jar file -->
-    <one-jar destfile="${build.dir}/limelight-lin64.jar">
-      <manifest>
-        <attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
-      </manifest>
-
-      <main>
-        <!-- construct limelight.jar -->
-        <fileset dir="${classes.dir}/src"/>
-      </main>
-
-      <lib>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </lib>
-
-      <binlib>
-        <fileset dir="${libs.lin64.dir}" includes="*"/>
-      </binlib>
-    </one-jar>
-  </target>
-
-  <target name="limelight-win32" depends="init">
-    <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/src">
-      <src path="${src.dir}"/>
-      <classpath path="${build.dir}"/>
-      <classpath>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </classpath>
-    </javac>
-
-    <!-- construct one-jar file -->
-    <one-jar destfile="${build.dir}/limelight-win32.jar">
-      <manifest>
-        <attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
-      </manifest>
-
-      <main>
-        <!-- construct limelight.jar -->
-        <fileset dir="${classes.dir}/src"/>
-      </main>
-
-      <lib>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </lib>
-
-      <binlib>
-        <fileset dir="${libs.win32.dir}" includes="*"/>
-      </binlib>
-    </one-jar>
-  </target>
-
-  <target name="limelight-win64" depends="init">
-    <!-- compile limelight -->
-    <javac includeantruntime="false" destdir="${classes.dir}/src">
-      <src path="${src.dir}"/>
-      <classpath path="${build.dir}"/>
-      <classpath>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </classpath>
-    </javac>
-
-    <!-- construct one-jar file -->
-    <one-jar destfile="${build.dir}/limelight-win64.jar">
-      <manifest>
-        <attribute name="One-Jar-Main-Class" value="com.limelight.Limelight"/>
-      </manifest>
-
-      <main>
-        <!-- construct limelight.jar -->
-        <fileset dir="${classes.dir}/src"/>
-      </main>
-
-      <lib>
-        <fileset dir="${libs.dir}" includes="*.jar"/>
-      </lib>
-
-      <binlib>
-        <fileset dir="${libs.win64.dir}" includes="*"/>
-      </binlib>
-    </one-jar>
-  </target>
-
 
 </project>
diff --git a/libs/lin64/libgamepad_jni.so b/libs/lin64/libgamepad_jni.so
deleted file mode 100755
index 3eb2314..0000000
Binary files a/libs/lin64/libgamepad_jni.so and /dev/null differ
diff --git a/libs/lin64/libnv_avc_dec.so b/libs/lin64/libnv_avc_dec.so
deleted file mode 100755
index e753361..0000000
Binary files a/libs/lin64/libnv_avc_dec.so and /dev/null differ
diff --git a/libs/lin64/libnv_opus_dec.so b/libs/lin64/libnv_opus_dec.so
deleted file mode 100755
index 0ce7fb6..0000000
Binary files a/libs/lin64/libnv_opus_dec.so and /dev/null differ
diff --git a/libs/osx/libgamepad_jni.dylib b/libs/osx/libgamepad_jni.dylib
deleted file mode 100644
index 4399c32..0000000
Binary files a/libs/osx/libgamepad_jni.dylib and /dev/null differ
diff --git a/libs/osx/libnv_avc_dec.dylib b/libs/osx/libnv_avc_dec.dylib
deleted file mode 100644
index 6e1c353..0000000
Binary files a/libs/osx/libnv_avc_dec.dylib and /dev/null differ
diff --git a/libs/osx/libnv_opus_dec.dylib b/libs/osx/libnv_opus_dec.dylib
deleted file mode 100644
index 048d836..0000000
Binary files a/libs/osx/libnv_opus_dec.dylib and /dev/null differ
diff --git a/libs/win32/avcodec-55.dll b/libs/win32/avcodec-55.dll
deleted file mode 100644
index 065d6e0..0000000
Binary files a/libs/win32/avcodec-55.dll and /dev/null differ
diff --git a/libs/win32/avfilter-3.dll b/libs/win32/avfilter-3.dll
deleted file mode 100644
index b5837ce..0000000
Binary files a/libs/win32/avfilter-3.dll and /dev/null differ
diff --git a/libs/win32/avformat-55.dll b/libs/win32/avformat-55.dll
deleted file mode 100644
index cbecee8..0000000
Binary files a/libs/win32/avformat-55.dll and /dev/null differ
diff --git a/libs/win32/avutil-52.dll b/libs/win32/avutil-52.dll
deleted file mode 100644
index cf32f21..0000000
Binary files a/libs/win32/avutil-52.dll and /dev/null differ
diff --git a/libs/win32/gamepad_jni.dll b/libs/win32/gamepad_jni.dll
deleted file mode 100644
index fe93fbb..0000000
Binary files a/libs/win32/gamepad_jni.dll and /dev/null differ
diff --git a/libs/win32/nv_avc_dec.dll b/libs/win32/nv_avc_dec.dll
deleted file mode 100644
index 2cb67cd..0000000
Binary files a/libs/win32/nv_avc_dec.dll and /dev/null differ
diff --git a/libs/win32/nv_opus_dec.dll b/libs/win32/nv_opus_dec.dll
deleted file mode 100644
index 9d3d66d..0000000
Binary files a/libs/win32/nv_opus_dec.dll and /dev/null differ
diff --git a/libs/win32/postproc-52.dll b/libs/win32/postproc-52.dll
deleted file mode 100644
index a3afd81..0000000
Binary files a/libs/win32/postproc-52.dll and /dev/null differ
diff --git a/libs/win32/pthreadVC2.dll b/libs/win32/pthreadVC2.dll
deleted file mode 100644
index fcb5d9d..0000000
Binary files a/libs/win32/pthreadVC2.dll and /dev/null differ
diff --git a/libs/win32/swresample-0.dll b/libs/win32/swresample-0.dll
deleted file mode 100644
index 8876f04..0000000
Binary files a/libs/win32/swresample-0.dll and /dev/null differ
diff --git a/libs/win32/swscale-2.dll b/libs/win32/swscale-2.dll
deleted file mode 100644
index d321f54..0000000
Binary files a/libs/win32/swscale-2.dll and /dev/null differ
diff --git a/libs/win64/avcodec-55.dll b/libs/win64/avcodec-55.dll
deleted file mode 100644
index 0ba2091..0000000
Binary files a/libs/win64/avcodec-55.dll and /dev/null differ
diff --git a/libs/win64/avfilter-3.dll b/libs/win64/avfilter-3.dll
deleted file mode 100644
index c6f5cba..0000000
Binary files a/libs/win64/avfilter-3.dll and /dev/null differ
diff --git a/libs/win64/avformat-55.dll b/libs/win64/avformat-55.dll
deleted file mode 100644
index 8ceb6b9..0000000
Binary files a/libs/win64/avformat-55.dll and /dev/null differ
diff --git a/libs/win64/avutil-52.dll b/libs/win64/avutil-52.dll
deleted file mode 100644
index 885d699..0000000
Binary files a/libs/win64/avutil-52.dll and /dev/null differ
diff --git a/libs/win64/gamepad_jni.dll b/libs/win64/gamepad_jni.dll
deleted file mode 100644
index 9286756..0000000
Binary files a/libs/win64/gamepad_jni.dll and /dev/null differ
diff --git a/libs/win64/nv_avc_dec.dll b/libs/win64/nv_avc_dec.dll
deleted file mode 100644
index 551b3aa..0000000
Binary files a/libs/win64/nv_avc_dec.dll and /dev/null differ
diff --git a/libs/win64/nv_opus_dec.dll b/libs/win64/nv_opus_dec.dll
deleted file mode 100644
index 0fd7fd7..0000000
Binary files a/libs/win64/nv_opus_dec.dll and /dev/null differ
diff --git a/libs/win64/postproc-52.dll b/libs/win64/postproc-52.dll
deleted file mode 100644
index 092a155..0000000
Binary files a/libs/win64/postproc-52.dll and /dev/null differ
diff --git a/libs/win64/pthreadVC2.dll b/libs/win64/pthreadVC2.dll
deleted file mode 100644
index 165b4d2..0000000
Binary files a/libs/win64/pthreadVC2.dll and /dev/null differ
diff --git a/libs/win64/swresample-0.dll b/libs/win64/swresample-0.dll
deleted file mode 100644
index 0dba170..0000000
Binary files a/libs/win64/swresample-0.dll and /dev/null differ
diff --git a/libs/win64/swscale-2.dll b/libs/win64/swscale-2.dll
deleted file mode 100644
index 1e5e76e..0000000
Binary files a/libs/win64/swscale-2.dll and /dev/null differ