diff --git a/tools/cooja/apps/serial_socket/cooja.config b/tools/cooja/apps/serial_socket/cooja.config
index 10b86f27f..8c492dc83 100644
--- a/tools/cooja/apps/serial_socket/cooja.config
+++ b/tools/cooja/apps/serial_socket/cooja.config
@@ -1,2 +1,2 @@
-org.contikios.cooja.Cooja.PLUGINS = + SerialSocketClient SerialSocketServer
+org.contikios.cooja.Cooja.PLUGINS = + org.contikios.cooja.serialsocket.SerialSocketClient org.contikios.cooja.serialsocket.SerialSocketServer
 org.contikios.cooja.Cooja.JARFILES = + serial_socket.jar
diff --git a/tools/cooja/apps/serial_socket/java/SerialSocketClient.java b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketClient.java
similarity index 99%
rename from tools/cooja/apps/serial_socket/java/SerialSocketClient.java
rename to tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketClient.java
index c3333c0b0..d29d8a2a6 100644
--- a/tools/cooja/apps/serial_socket/java/SerialSocketClient.java
+++ b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketClient.java
@@ -1,3 +1,5 @@
+package org.contikios.cooja.serialsocket;
+
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
  * All rights reserved.
diff --git a/tools/cooja/apps/serial_socket/java/SerialSocketServer.java b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
similarity index 99%
rename from tools/cooja/apps/serial_socket/java/SerialSocketServer.java
rename to tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
index b12197ee0..2c99dd7a9 100644
--- a/tools/cooja/apps/serial_socket/java/SerialSocketServer.java
+++ b/tools/cooja/apps/serial_socket/java/org/contikios/cooja/serialsocket/SerialSocketServer.java
@@ -1,3 +1,5 @@
+package org.contikios.cooja.serialsocket;
+
 /*
  * Copyright (c) 2010, Swedish Institute of Computer Science.
  * All rights reserved.