diff --git a/AndroidExplorerbotServer/.classpath b/AndroidExplorerbotServer/.classpath
new file mode 100644
index 0000000..7c76757
--- /dev/null
+++ b/AndroidExplorerbotServer/.classpath
@@ -0,0 +1,8 @@
+
+
+
+
+
+
+
+
diff --git a/AndroidExplorerbotServer/.project b/AndroidExplorerbotServer/.project
new file mode 100644
index 0000000..2f37185
--- /dev/null
+++ b/AndroidExplorerbotServer/.project
@@ -0,0 +1,33 @@
+
+
+ AndroidExplorerbotServer
+
+
+
+
+
+ com.android.ide.eclipse.adt.ResourceManagerBuilder
+
+
+
+
+ com.android.ide.eclipse.adt.PreCompilerBuilder
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+ com.android.ide.eclipse.adt.ApkBuilder
+
+
+
+
+
+ com.android.ide.eclipse.adt.AndroidNature
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/AndroidExplorerbotServer/bin/AndroidExplorerbotServer.apk b/AndroidExplorerbotServer/bin/AndroidExplorerbotServer.apk
deleted file mode 100644
index c774de7..0000000
Binary files a/AndroidExplorerbotServer/bin/AndroidExplorerbotServer.apk and /dev/null differ
diff --git a/AndroidExplorerbotServer/bin/classes.dex b/AndroidExplorerbotServer/bin/classes.dex
deleted file mode 100644
index d7f98dc..0000000
Binary files a/AndroidExplorerbotServer/bin/classes.dex and /dev/null differ
diff --git a/AndroidExplorerbotServer/bin/classes/.gitignore b/AndroidExplorerbotServer/bin/classes/.gitignore
index d958f16..bf2b233 100644
--- a/AndroidExplorerbotServer/bin/classes/.gitignore
+++ b/AndroidExplorerbotServer/bin/classes/.gitignore
@@ -1 +1,2 @@
/it
+/.gitignore
diff --git a/AndroidExplorerbotServer/bin/dexedLibs/android-support-v4-7707150e79a0cf40d50b916fde2d881a.jar b/AndroidExplorerbotServer/bin/dexedLibs/android-support-v4-7707150e79a0cf40d50b916fde2d881a.jar
index 5d48323..6352c85 100644
Binary files a/AndroidExplorerbotServer/bin/dexedLibs/android-support-v4-7707150e79a0cf40d50b916fde2d881a.jar and b/AndroidExplorerbotServer/bin/dexedLibs/android-support-v4-7707150e79a0cf40d50b916fde2d881a.jar differ
diff --git a/AndroidExplorerbotServer/bin/dexedLibs/usb-serial-for-android-v010-c6d8e36f1aeec7d4e0e59d3c42bf7e59.jar b/AndroidExplorerbotServer/bin/dexedLibs/usb-serial-for-android-v010-c6d8e36f1aeec7d4e0e59d3c42bf7e59.jar
index a0d78ea..9175caa 100644
Binary files a/AndroidExplorerbotServer/bin/dexedLibs/usb-serial-for-android-v010-c6d8e36f1aeec7d4e0e59d3c42bf7e59.jar and b/AndroidExplorerbotServer/bin/dexedLibs/usb-serial-for-android-v010-c6d8e36f1aeec7d4e0e59d3c42bf7e59.jar differ
diff --git a/AndroidExplorerbotServer/bin/resources.ap_ b/AndroidExplorerbotServer/bin/resources.ap_
deleted file mode 100644
index 1854540..0000000
Binary files a/AndroidExplorerbotServer/bin/resources.ap_ and /dev/null differ
diff --git a/AndroidExplorerbotServer/gen/.gitignore b/AndroidExplorerbotServer/gen/.gitignore
index d958f16..bf2b233 100644
--- a/AndroidExplorerbotServer/gen/.gitignore
+++ b/AndroidExplorerbotServer/gen/.gitignore
@@ -1 +1,2 @@
/it
+/.gitignore
diff --git a/ExplorerBot/.classpath b/ExplorerBot/.classpath
new file mode 100644
index 0000000..0ae80f5
--- /dev/null
+++ b/ExplorerBot/.classpath
@@ -0,0 +1,12 @@
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ExplorerBot/.project b/ExplorerBot/.project
new file mode 100644
index 0000000..60dc919
--- /dev/null
+++ b/ExplorerBot/.project
@@ -0,0 +1,17 @@
+
+
+ ExplorerBot
+
+
+
+
+
+ org.eclipse.jdt.core.javabuilder
+
+
+
+
+
+ org.eclipse.jdt.core.javanature
+
+
diff --git a/ExplorerBot/bin/.gitignore b/ExplorerBot/bin/.gitignore
new file mode 100644
index 0000000..d958f16
--- /dev/null
+++ b/ExplorerBot/bin/.gitignore
@@ -0,0 +1 @@
+/it
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/AppConfiguration.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/AppConfiguration.class
index 4fd328f..3453529 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/AppConfiguration.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/AppConfiguration.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/Main.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/Main.class
index 218743e..c59db5d 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/Main.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/Main.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ClientNetworkCommunicationThread.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ClientNetworkCommunicationThread.class
index 3306412..254d192 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ClientNetworkCommunicationThread.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ClientNetworkCommunicationThread.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ControllerPollThread.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ControllerPollThread.class
index 242e53f..af78415 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ControllerPollThread.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/ControllerPollThread.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/Gamepad.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/Gamepad.class
index a028abc..023e612 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/Gamepad.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/Gamepad.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/PollControllerAndSendActivity.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/PollControllerAndSendActivity.class
index 883f20e..5fc404d 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/client/PollControllerAndSendActivity.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/client/PollControllerAndSendActivity.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/interfaces/OnControllerPolledListener.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/interfaces/OnControllerPolledListener.class
index 4265517..c7804a9 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/interfaces/OnControllerPolledListener.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/interfaces/OnControllerPolledListener.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/objects/GamepadPosition.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/objects/GamepadPosition.class
index ff54e95..b750311 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/objects/GamepadPosition.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/objects/GamepadPosition.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/PollNetworkAndSendToArduinoActivity.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/PollNetworkAndSendToArduinoActivity.class
index 8b89334..d173997 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/PollNetworkAndSendToArduinoActivity.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/PollNetworkAndSendToArduinoActivity.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/SerialCommunication.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/SerialCommunication.class
index 3ca888a..b34ea28 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/SerialCommunication.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/SerialCommunication.class differ
diff --git a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/ServerNetworkCommunicationThread.class b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/ServerNetworkCommunicationThread.class
index 1ad65be..946bc7a 100644
Binary files a/ExplorerBot/bin/it/danieleverducci/explorerbot/server/ServerNetworkCommunicationThread.class and b/ExplorerBot/bin/it/danieleverducci/explorerbot/server/ServerNetworkCommunicationThread.class differ
diff --git a/ExplorerBot/libs/JInput/jinput-test.jar b/ExplorerBot/libs/JInput/jinput-test.jar
deleted file mode 100644
index 56a9395..0000000
Binary files a/ExplorerBot/libs/JInput/jinput-test.jar and /dev/null differ
diff --git a/ExplorerBot/libs/JInput/jinput_nightly_20140302.zip b/ExplorerBot/libs/JInput/jinput_nightly_20140302.zip
deleted file mode 100644
index 44bd5fb..0000000
Binary files a/ExplorerBot/libs/JInput/jinput_nightly_20140302.zip and /dev/null differ
diff --git a/bin/AndroidExplorerbotServer.apk b/bin/AndroidExplorerbotServer.apk
new file mode 100644
index 0000000..46c6ebb
Binary files /dev/null and b/bin/AndroidExplorerbotServer.apk differ
diff --git a/bin/README.txt b/bin/README.txt
new file mode 100644
index 0000000..da3b237
--- /dev/null
+++ b/bin/README.txt
@@ -0,0 +1,9 @@
+Usage (under linux):
+
+SERVER (connected to Arduino)
+sh start_server.sh
+
+CLIENT (connected to joypad)
+sh start_client.sh [serveripaddress]
+
+Example: sh start_client.sh 192.168.0.32
\ No newline at end of file
diff --git a/bin/explorerbot.jar b/bin/explorerbot.jar
new file mode 100644
index 0000000..24d1fb4
Binary files /dev/null and b/bin/explorerbot.jar differ
diff --git a/bin/explorerbot_lib/jinput-dx8.dll b/bin/explorerbot_lib/jinput-dx8.dll
new file mode 100644
index 0000000..f9fdd35
Binary files /dev/null and b/bin/explorerbot_lib/jinput-dx8.dll differ
diff --git a/bin/explorerbot_lib/jinput-dx8_64.dll b/bin/explorerbot_lib/jinput-dx8_64.dll
new file mode 100644
index 0000000..e6fe057
Binary files /dev/null and b/bin/explorerbot_lib/jinput-dx8_64.dll differ
diff --git a/bin/explorerbot_lib/jinput-raw.dll b/bin/explorerbot_lib/jinput-raw.dll
new file mode 100644
index 0000000..d9fdcec
Binary files /dev/null and b/bin/explorerbot_lib/jinput-raw.dll differ
diff --git a/bin/explorerbot_lib/jinput-raw_64.dll b/bin/explorerbot_lib/jinput-raw_64.dll
new file mode 100644
index 0000000..685ecd1
Binary files /dev/null and b/bin/explorerbot_lib/jinput-raw_64.dll differ
diff --git a/bin/explorerbot_lib/jinput-wintab.dll b/bin/explorerbot_lib/jinput-wintab.dll
new file mode 100644
index 0000000..1bec709
Binary files /dev/null and b/bin/explorerbot_lib/jinput-wintab.dll differ
diff --git a/bin/explorerbot_lib/jinput.jar b/bin/explorerbot_lib/jinput.jar
new file mode 100644
index 0000000..f4c9352
Binary files /dev/null and b/bin/explorerbot_lib/jinput.jar differ
diff --git a/bin/explorerbot_lib/jssc.jar b/bin/explorerbot_lib/jssc.jar
new file mode 100644
index 0000000..eb74f15
Binary files /dev/null and b/bin/explorerbot_lib/jssc.jar differ
diff --git a/bin/explorerbot_lib/libjinput-linux.so b/bin/explorerbot_lib/libjinput-linux.so
new file mode 100644
index 0000000..dba9e59
Binary files /dev/null and b/bin/explorerbot_lib/libjinput-linux.so differ
diff --git a/bin/explorerbot_lib/libjinput-linux64.so b/bin/explorerbot_lib/libjinput-linux64.so
new file mode 100644
index 0000000..9df47f9
Binary files /dev/null and b/bin/explorerbot_lib/libjinput-linux64.so differ
diff --git a/bin/explorerbot_lib/libjinput-osx.jnilib b/bin/explorerbot_lib/libjinput-osx.jnilib
new file mode 100644
index 0000000..1cf6dbb
Binary files /dev/null and b/bin/explorerbot_lib/libjinput-osx.jnilib differ
diff --git a/bin/start_client.sh b/bin/start_client.sh
new file mode 100644
index 0000000..cc18228
--- /dev/null
+++ b/bin/start_client.sh
@@ -0,0 +1,6 @@
+#!/bin/sh
+# Starts the explorerbot's client.
+# Usage: start_server [ipaddress]
+# Example: start_server 192.168.0.35
+
+java -Djava.library.path="./explorerbot_lib/" -jar explorerbot.jar client $1
diff --git a/bin/start_server.sh b/bin/start_server.sh
new file mode 100644
index 0000000..1b32934
--- /dev/null
+++ b/bin/start_server.sh
@@ -0,0 +1,4 @@
+#!/bin/sh
+# Starts the explorerbot as server (the one connected to the Arduino and receiving commands from the network
+
+java -jar explorerbot.jar server
\ No newline at end of file