diff --git a/Makefile b/Makefile
index 41e50596c..b187fd454 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,5 @@
 INSTALL_FOLDER=$(CURDIR)/Unreal/CarlaUE4/Plugins/Carla/CarlaServer
-PYTHON_CLIENT_FOLDER=$(CURDIR)/PythonClient/test
+PYTHON_CLIENT_FOLDER=$(CURDIR)/Util/TestingClient/test
 BASE_BUILD_FOLDER=$(CURDIR)/Util/Build/carlaserver-build
 MY_CMAKE_FOLDER=$(CURDIR)/Util/cmake
 MY_CMAKE_FLAGS=-B"$(BUILD_FOLDER)" -DCMAKE_INSTALL_PREFIX="$(INSTALL_FOLDER)"
diff --git a/Util/Protoc.bat b/Util/Protoc.bat
index 551811f29..d19b909dc 100644
--- a/Util/Protoc.bat
+++ b/Util/Protoc.bat
@@ -2,7 +2,7 @@
 
 set PROTOBUF_SRC_DIR=Proto
 set PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-set PROTOBUF_PY_OUT_DIR=../PythonClient/carla
+set PROTOBUF_PY_OUT_DIR=TestingClient/carla
 set PROTO_BASENAME=carla_server
 
 if "%1" == "--clean" (
diff --git a/Util/Protoc.sh b/Util/Protoc.sh
index 8dd7a5ad2..f71f4e853 100755
--- a/Util/Protoc.sh
+++ b/Util/Protoc.sh
@@ -7,7 +7,7 @@ pushd "$SCRIPT_DIR" >/dev/null
 
 PROTOBUF_SRC_DIR=Proto
 PROTOBUF_CPP_OUT_DIR=CarlaServer/source/carla/server
-PROTOBUF_PY_OUT_DIR=../PythonClient/carla
+PROTOBUF_PY_OUT_DIR=TestingClient/carla
 PROTO_BASENAME=carla_server
 
 if [ "$1" == "--clean" ]; then
diff --git a/PythonClient/__init__.py b/Util/TestingClient/__init__.py
similarity index 100%
rename from PythonClient/__init__.py
rename to Util/TestingClient/__init__.py
diff --git a/PythonClient/carla/__init__.py b/Util/TestingClient/carla/__init__.py
similarity index 100%
rename from PythonClient/carla/__init__.py
rename to Util/TestingClient/carla/__init__.py
diff --git a/PythonClient/carla/client.py b/Util/TestingClient/carla/client.py
similarity index 100%
rename from PythonClient/carla/client.py
rename to Util/TestingClient/carla/client.py
diff --git a/PythonClient/carla/console.py b/Util/TestingClient/carla/console.py
similarity index 100%
rename from PythonClient/carla/console.py
rename to Util/TestingClient/carla/console.py
diff --git a/PythonClient/carla/settings.py b/Util/TestingClient/carla/settings.py
similarity index 100%
rename from PythonClient/carla/settings.py
rename to Util/TestingClient/carla/settings.py
diff --git a/PythonClient/carla/tcp.py b/Util/TestingClient/carla/tcp.py
similarity index 100%
rename from PythonClient/carla/tcp.py
rename to Util/TestingClient/carla/tcp.py
diff --git a/PythonClient/carla/util.py b/Util/TestingClient/carla/util.py
similarity index 100%
rename from PythonClient/carla/util.py
rename to Util/TestingClient/carla/util.py
diff --git a/PythonClient/client_example.py b/Util/TestingClient/client_example.py
similarity index 100%
rename from PythonClient/client_example.py
rename to Util/TestingClient/client_example.py
diff --git a/PythonClient/test/test_client.py b/Util/TestingClient/test/test_client.py
similarity index 100%
rename from PythonClient/test/test_client.py
rename to Util/TestingClient/test/test_client.py
diff --git a/PythonClient/test/test_suite.py b/Util/TestingClient/test/test_suite.py
similarity index 100%
rename from PythonClient/test/test_suite.py
rename to Util/TestingClient/test/test_suite.py
diff --git a/PythonClient/test/unit_tests/Basic.py b/Util/TestingClient/test/unit_tests/Basic.py
similarity index 100%
rename from PythonClient/test/unit_tests/Basic.py
rename to Util/TestingClient/test/unit_tests/Basic.py