diff --git a/source/nodemcu/statusclient/certs.template b/source/client/nodemcu/statusclient/certs.template
similarity index 100%
rename from source/nodemcu/statusclient/certs.template
rename to source/client/nodemcu/statusclient/certs.template
diff --git a/source/nodemcu/statusclient/config.h b/source/client/nodemcu/statusclient/config.h
similarity index 100%
rename from source/nodemcu/statusclient/config.h
rename to source/client/nodemcu/statusclient/config.h
diff --git a/source/nodemcu/statusclient/credentials.template b/source/client/nodemcu/statusclient/credentials.template
similarity index 100%
rename from source/nodemcu/statusclient/credentials.template
rename to source/client/nodemcu/statusclient/credentials.template
diff --git a/source/nodemcu/statusclient/statusclient.ino b/source/client/nodemcu/statusclient/statusclient.ino
similarity index 100%
rename from source/nodemcu/statusclient/statusclient.ino
rename to source/client/nodemcu/statusclient/statusclient.ino
diff --git a/source/server/setstatus.conf b/source/client/python/setstatus.conf
similarity index 100%
rename from source/server/setstatus.conf
rename to source/client/python/setstatus.conf
diff --git a/source/server/setstatus.py b/source/client/python/setstatus.py
similarity index 100%
rename from source/server/setstatus.py
rename to source/client/python/setstatus.py
diff --git a/source/server/watchdoor.py b/source/client/python/watchdoor.py
similarity index 100%
rename from source/server/watchdoor.py
rename to source/client/python/watchdoor.py
diff --git a/source/server/watchdoor.service b/source/client/python/watchdoor.service
similarity index 100%
rename from source/server/watchdoor.service
rename to source/client/python/watchdoor.service