diff --git a/Cube4Fun/src/CubeNetwork.cpp b/Cube4Fun/src/CubeNetwork.cpp
index 9d6c2f4..c8a0802 100644
--- a/Cube4Fun/src/CubeNetwork.cpp
+++ b/Cube4Fun/src/CubeNetwork.cpp
@@ -228,7 +228,7 @@ void CubeNetwork::sendBytes(const unsigned char* byteBuffer, unsigned int byteLe
             // let arduino knows what to expect
             msgStartWrite(byteLength);
             char myBuffer[4];
-            int ret = stream->receive(myBuffer,4);
+            long ret = stream->receive(myBuffer,4);
             printf("received Length:\n");
             printf("0: %u\n", myBuffer[0]);
             printf("1: %u\n", myBuffer[1]);
diff --git a/Cube4Fun/tcpconnector.cpp b/Cube4Fun/src/tcpconnector.cpp
similarity index 98%
rename from Cube4Fun/tcpconnector.cpp
rename to Cube4Fun/src/tcpconnector.cpp
index 9615fdd..f3a6691 100755
--- a/Cube4Fun/tcpconnector.cpp
+++ b/Cube4Fun/src/tcpconnector.cpp
@@ -6,7 +6,7 @@
 
    ------------------------------------------
 
-   Copyright © 2013 [Vic Hargrave - http://vichargrave.com]
+   Copyright � 2013 [Vic Hargrave - http://vichargrave.com]
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/Cube4Fun/tcpconnector.h b/Cube4Fun/src/tcpconnector.h
similarity index 100%
rename from Cube4Fun/tcpconnector.h
rename to Cube4Fun/src/tcpconnector.h
diff --git a/Cube4Fun/tcpstream.cpp b/Cube4Fun/src/tcpstream.cpp
similarity index 100%
rename from Cube4Fun/tcpstream.cpp
rename to Cube4Fun/src/tcpstream.cpp
diff --git a/Cube4Fun/tcpstream.h b/Cube4Fun/src/tcpstream.h
similarity index 100%
rename from Cube4Fun/tcpstream.h
rename to Cube4Fun/src/tcpstream.h