diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index f0852425145cfa23b582c10a1a764f5d87a0ef8f..0000000000000000000000000000000000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,4 +0,0 @@
-language: java
-script: cd client && mvn clean package
-notifications:
-    slack: cylab-be:achLIftQ5SqdRgGjeuEq0Sc9
diff --git a/client/LICENSE b/java-client/LICENSE
similarity index 100%
rename from client/LICENSE
rename to java-client/LICENSE
diff --git a/client/README.md b/java-client/README.md
similarity index 100%
rename from client/README.md
rename to java-client/README.md
diff --git a/client/pom.xml b/java-client/pom.xml
similarity index 100%
rename from client/pom.xml
rename to java-client/pom.xml
diff --git a/client/src/main/java/rucd/monitoring/client/AbstractSensor.java b/java-client/src/main/java/rucd/monitoring/client/AbstractSensor.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/AbstractSensor.java
rename to java-client/src/main/java/rucd/monitoring/client/AbstractSensor.java
diff --git a/client/src/main/java/rucd/monitoring/client/Disk.java b/java-client/src/main/java/rucd/monitoring/client/Disk.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Disk.java
rename to java-client/src/main/java/rucd/monitoring/client/Disk.java
diff --git a/client/src/main/java/rucd/monitoring/client/Inodes.java b/java-client/src/main/java/rucd/monitoring/client/Inodes.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Inodes.java
rename to java-client/src/main/java/rucd/monitoring/client/Inodes.java
diff --git a/client/src/main/java/rucd/monitoring/client/Main.java b/java-client/src/main/java/rucd/monitoring/client/Main.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Main.java
rename to java-client/src/main/java/rucd/monitoring/client/Main.java
diff --git a/client/src/main/java/rucd/monitoring/client/Monitor.java b/java-client/src/main/java/rucd/monitoring/client/Monitor.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Monitor.java
rename to java-client/src/main/java/rucd/monitoring/client/Monitor.java
diff --git a/client/src/main/java/rucd/monitoring/client/Network.java b/java-client/src/main/java/rucd/monitoring/client/Network.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Network.java
rename to java-client/src/main/java/rucd/monitoring/client/Network.java
diff --git a/client/src/main/java/rucd/monitoring/client/Reboot.java b/java-client/src/main/java/rucd/monitoring/client/Reboot.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Reboot.java
rename to java-client/src/main/java/rucd/monitoring/client/Reboot.java
diff --git a/client/src/main/java/rucd/monitoring/client/Sensor.java b/java-client/src/main/java/rucd/monitoring/client/Sensor.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Sensor.java
rename to java-client/src/main/java/rucd/monitoring/client/Sensor.java
diff --git a/client/src/main/java/rucd/monitoring/client/TCP.java b/java-client/src/main/java/rucd/monitoring/client/TCP.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/TCP.java
rename to java-client/src/main/java/rucd/monitoring/client/TCP.java
diff --git a/client/src/main/java/rucd/monitoring/client/UDP.java b/java-client/src/main/java/rucd/monitoring/client/UDP.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/UDP.java
rename to java-client/src/main/java/rucd/monitoring/client/UDP.java
diff --git a/client/src/main/java/rucd/monitoring/client/Uploader.java b/java-client/src/main/java/rucd/monitoring/client/Uploader.java
similarity index 100%
rename from client/src/main/java/rucd/monitoring/client/Uploader.java
rename to java-client/src/main/java/rucd/monitoring/client/Uploader.java