diff --git a/Source/CarlaServer/.gitignore b/Util/CarlaServer/.gitignore
similarity index 100%
rename from Source/CarlaServer/.gitignore
rename to Util/CarlaServer/.gitignore
diff --git a/Source/CarlaServer/CMakeLists.txt b/Util/CarlaServer/CMakeLists.txt
similarity index 100%
rename from Source/CarlaServer/CMakeLists.txt
rename to Util/CarlaServer/CMakeLists.txt
diff --git a/Source/CarlaServer/Makefile b/Util/CarlaServer/Makefile
similarity index 100%
rename from Source/CarlaServer/Makefile
rename to Util/CarlaServer/Makefile
diff --git a/Source/CarlaServer/README.md b/Util/CarlaServer/README.md
similarity index 100%
rename from Source/CarlaServer/README.md
rename to Util/CarlaServer/README.md
diff --git a/Source/CarlaServer/source/carla/CarlaServer.cpp b/Util/CarlaServer/source/carla/CarlaServer.cpp
similarity index 100%
rename from Source/CarlaServer/source/carla/CarlaServer.cpp
rename to Util/CarlaServer/source/carla/CarlaServer.cpp
diff --git a/Source/CarlaServer/source/carla/CarlaServer.h b/Util/CarlaServer/source/carla/CarlaServer.h
similarity index 100%
rename from Source/CarlaServer/source/carla/CarlaServer.h
rename to Util/CarlaServer/source/carla/CarlaServer.h
diff --git a/Source/CarlaServer/source/carla/Logging.h b/Util/CarlaServer/source/carla/Logging.h
similarity index 100%
rename from Source/CarlaServer/source/carla/Logging.h
rename to Util/CarlaServer/source/carla/Logging.h
diff --git a/Source/CarlaServer/source/carla/NonCopyable.h b/Util/CarlaServer/source/carla/NonCopyable.h
similarity index 100%
rename from Source/CarlaServer/source/carla/NonCopyable.h
rename to Util/CarlaServer/source/carla/NonCopyable.h
diff --git a/Source/CarlaServer/source/carla/server/.gitignore b/Util/CarlaServer/source/carla/server/.gitignore
similarity index 100%
rename from Source/CarlaServer/source/carla/server/.gitignore
rename to Util/CarlaServer/source/carla/server/.gitignore
diff --git a/Source/CarlaServer/source/carla/server/CMakeLists.txt b/Util/CarlaServer/source/carla/server/CMakeLists.txt
similarity index 100%
rename from Source/CarlaServer/source/carla/server/CMakeLists.txt
rename to Util/CarlaServer/source/carla/server/CMakeLists.txt
diff --git a/Source/CarlaServer/source/carla/server/CarlaCommunication.cpp b/Util/CarlaServer/source/carla/server/CarlaCommunication.cpp
similarity index 100%
rename from Source/CarlaServer/source/carla/server/CarlaCommunication.cpp
rename to Util/CarlaServer/source/carla/server/CarlaCommunication.cpp
diff --git a/Source/CarlaServer/source/carla/server/CarlaCommunication.h b/Util/CarlaServer/source/carla/server/CarlaCommunication.h
similarity index 100%
rename from Source/CarlaServer/source/carla/server/CarlaCommunication.h
rename to Util/CarlaServer/source/carla/server/CarlaCommunication.h
diff --git a/Source/CarlaServer/source/carla/server/Protocol.cpp b/Util/CarlaServer/source/carla/server/Protocol.cpp
similarity index 100%
rename from Source/CarlaServer/source/carla/server/Protocol.cpp
rename to Util/CarlaServer/source/carla/server/Protocol.cpp
diff --git a/Source/CarlaServer/source/carla/server/Protocol.h b/Util/CarlaServer/source/carla/server/Protocol.h
similarity index 100%
rename from Source/CarlaServer/source/carla/server/Protocol.h
rename to Util/CarlaServer/source/carla/server/Protocol.h
diff --git a/Source/CarlaServer/source/carla/server/TCPServer.cpp b/Util/CarlaServer/source/carla/server/TCPServer.cpp
similarity index 100%
rename from Source/CarlaServer/source/carla/server/TCPServer.cpp
rename to Util/CarlaServer/source/carla/server/TCPServer.cpp
diff --git a/Source/CarlaServer/source/carla/server/TCPServer.h b/Util/CarlaServer/source/carla/server/TCPServer.h
similarity index 100%
rename from Source/CarlaServer/source/carla/server/TCPServer.h
rename to Util/CarlaServer/source/carla/server/TCPServer.h
diff --git a/Source/CarlaServer/source/carla/server/carla_protocol.proto b/Util/CarlaServer/source/carla/server/carla_protocol.proto
similarity index 100%
rename from Source/CarlaServer/source/carla/server/carla_protocol.proto
rename to Util/CarlaServer/source/carla/server/carla_protocol.proto
diff --git a/Source/CarlaServer/source/carla/thread/AsyncReadWriteJobQueue.h b/Util/CarlaServer/source/carla/thread/AsyncReadWriteJobQueue.h
similarity index 100%
rename from Source/CarlaServer/source/carla/thread/AsyncReadWriteJobQueue.h
rename to Util/CarlaServer/source/carla/thread/AsyncReadWriteJobQueue.h
diff --git a/Source/CarlaServer/source/carla/thread/AsyncReaderJobQueue.h b/Util/CarlaServer/source/carla/thread/AsyncReaderJobQueue.h
similarity index 100%
rename from Source/CarlaServer/source/carla/thread/AsyncReaderJobQueue.h
rename to Util/CarlaServer/source/carla/thread/AsyncReaderJobQueue.h
diff --git a/Source/CarlaServer/source/carla/thread/AsyncWriterJobQueue.h b/Util/CarlaServer/source/carla/thread/AsyncWriterJobQueue.h
similarity index 100%
rename from Source/CarlaServer/source/carla/thread/AsyncWriterJobQueue.h
rename to Util/CarlaServer/source/carla/thread/AsyncWriterJobQueue.h
diff --git a/Source/CarlaServer/source/carla/thread/ThreadSafeQueue.h b/Util/CarlaServer/source/carla/thread/ThreadSafeQueue.h
similarity index 100%
rename from Source/CarlaServer/source/carla/thread/ThreadSafeQueue.h
rename to Util/CarlaServer/source/carla/thread/ThreadSafeQueue.h
diff --git a/Source/CarlaServer/source/carla/thread/ThreadUniquePointer.h b/Util/CarlaServer/source/carla/thread/ThreadUniquePointer.h
similarity index 100%
rename from Source/CarlaServer/source/carla/thread/ThreadUniquePointer.h
rename to Util/CarlaServer/source/carla/thread/ThreadUniquePointer.h
diff --git a/Source/CarlaServer/source/test/CMakeLists.txt b/Util/CarlaServer/source/test/CMakeLists.txt
similarity index 100%
rename from Source/CarlaServer/source/test/CMakeLists.txt
rename to Util/CarlaServer/source/test/CMakeLists.txt
diff --git a/Source/CarlaServer/source/test/async_server.cpp b/Util/CarlaServer/source/test/async_server.cpp
similarity index 100%
rename from Source/CarlaServer/source/test/async_server.cpp
rename to Util/CarlaServer/source/test/async_server.cpp
diff --git a/Source/CarlaServer/source/test/client.cpp b/Util/CarlaServer/source/test/client.cpp
similarity index 100%
rename from Source/CarlaServer/source/test/client.cpp
rename to Util/CarlaServer/source/test/client.cpp
diff --git a/Source/CarlaServer/source/test/sync_server.cpp b/Util/CarlaServer/source/test/sync_server.cpp
similarity index 100%
rename from Source/CarlaServer/source/test/sync_server.cpp
rename to Util/CarlaServer/source/test/sync_server.cpp