diff --git a/examples/tcp/labcommTCPtest/LabCommRegister.java b/examples/tcp/labcommTCPtest/LabCommRegister.java
deleted file mode 100644
index 94585e91ef9d169a57d23b3b01a9a7845aa566b5..0000000000000000000000000000000000000000
--- a/examples/tcp/labcommTCPtest/LabCommRegister.java
+++ /dev/null
@@ -1,5 +0,0 @@
-package labcommTCPtest;
-public class LabCommRegister {
-
-
-}
diff --git a/examples/tcp/labcommTCPtest/client/TestClient.java b/examples/tcp/labcommTCPtest/client/TestClient.java
index c0402666e7f1f6b8efb431784889f43b0d065a0f..c7ec50610c1766b0ffe0acb35ea879d9c05ee0ec 100644
--- a/examples/tcp/labcommTCPtest/client/TestClient.java
+++ b/examples/tcp/labcommTCPtest/client/TestClient.java
@@ -8,8 +8,8 @@ import java.net.UnknownHostException;
 
 import se.lth.control.labcomm.LabCommDecoderChannel;
 import se.lth.control.labcomm.LabCommEncoderChannel;
-import labcommTCPtest.FooSample;
-import labcommTCPtest.FooSample.Handler;
+import labcommTCPtest.gen.FooSample;
+import labcommTCPtest.gen.FooSample.Handler;
 
 public class TestClient implements Handler {
 
diff --git a/examples/tcp/labcommTCPtest/server/TestServer.java b/examples/tcp/labcommTCPtest/server/TestServer.java
index c3511d08b100a5863e4ca05b3f3a0e13a12ca512..d53c7f9bb3f0692c8613fc3cd24cbf7e1f83fd18 100644
--- a/examples/tcp/labcommTCPtest/server/TestServer.java
+++ b/examples/tcp/labcommTCPtest/server/TestServer.java
@@ -10,8 +10,8 @@ import java.net.Socket;
 
 import se.lth.control.labcomm.LabCommDecoderChannel;
 import se.lth.control.labcomm.LabCommEncoderChannel;
-import labcommTCPtest.FooSample;
-import labcommTCPtest.FooSample.Handler;
+import labcommTCPtest.gen.FooSample;
+import labcommTCPtest.gen.FooSample.Handler;
 
 public class TestServer implements Handler {