diff --git a/client/doc/README.md b/client/doc/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..2a2f8ce165e32228646989c3e29949a7df3d0b00
--- /dev/null
+++ b/client/doc/README.md
@@ -0,0 +1 @@
+## Documentation goes here
\ No newline at end of file
diff --git a/client/config.ini b/client/resources/client.conf
similarity index 86%
rename from client/config.ini
rename to client/resources/client.conf
index 09b66fcf9219a3ba8be8b1ae2a871846ad91cbb2..3643655ff5a83e7c6358a42a8e090c0d6326a266 100644
--- a/client/config.ini
+++ b/client/resources/client.conf
@@ -8,7 +8,7 @@ port = 8000
 end_point = /api/v1/usb-logs
 
 [logger]
-config_file = logger.conf
+config_file = ../resources/logger.conf
 
 [cache]
 directory = data
diff --git a/client/logger.conf b/client/resources/logger.conf
similarity index 100%
rename from client/logger.conf
rename to client/resources/logger.conf
diff --git a/client/api_client.py b/client/src/api_client.py
similarity index 100%
rename from client/api_client.py
rename to client/src/api_client.py
diff --git a/client/config_manager.py b/client/src/config_manager.py
similarity index 100%
rename from client/config_manager.py
rename to client/src/config_manager.py
diff --git a/client/main.py b/client/src/main.py
similarity index 99%
rename from client/main.py
rename to client/src/main.py
index fa85e69078b62262daf271f5b6ec61417c80288e..535794ec36c5cdb239dfc225f57d13c0f6db419f 100644
--- a/client/main.py
+++ b/client/src/main.py
@@ -28,7 +28,7 @@ if __name__ == "__main__":
     except singleton.SingleInstanceException:
         exit(1)
 
-    arg_parser = argparse.ArgumentParser(description="ZF USB Licence Detector")
+    arg_parser = argparse.ArgumentParser(description="ZF USB License Detector")
     arg_parser.add_argument("-c", "--config", dest="config", required=True, help="Path to the configuration file")
     args = arg_parser.parse_args()
 
diff --git a/client/usb_detector/__init__.py b/client/src/usb_detector/__init__.py
similarity index 100%
rename from client/usb_detector/__init__.py
rename to client/src/usb_detector/__init__.py
diff --git a/client/usb_detector/detector.py b/client/src/usb_detector/detector.py
similarity index 100%
rename from client/usb_detector/detector.py
rename to client/src/usb_detector/detector.py
diff --git a/client/usb_detector/event_listener.py b/client/src/usb_detector/event_listener.py
similarity index 100%
rename from client/usb_detector/event_listener.py
rename to client/src/usb_detector/event_listener.py
diff --git a/client/usb_detector/usb_reader.py b/client/src/usb_detector/usb_reader.py
similarity index 100%
rename from client/usb_detector/usb_reader.py
rename to client/src/usb_detector/usb_reader.py
diff --git a/client/tests/README.md b/client/tests/README.md
new file mode 100644
index 0000000000000000000000000000000000000000..df59d547b9136b5356e4647a85482677b6a53d47
--- /dev/null
+++ b/client/tests/README.md
@@ -0,0 +1 @@
+## Tests go gere
\ No newline at end of file