diff --git a/deprecated/src/domod/builders/cmake/CMakeLists.txt b/src/prog/domod/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/src/domod/builders/cmake/CMakeLists.txt
rename to src/prog/domod/builders/cmake/CMakeLists.txt
diff --git a/deprecated/src/domod/src/devices/Device.cpp b/src/prog/domod/src/devices/Device.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/Device.cpp
rename to src/prog/domod/src/devices/Device.cpp
diff --git a/deprecated/src/domod/src/devices/Device.h b/src/prog/domod/src/devices/Device.h
similarity index 100%
rename from deprecated/src/domod/src/devices/Device.h
rename to src/prog/domod/src/devices/Device.h
diff --git a/deprecated/src/domod/src/devices/Devices.cpp b/src/prog/domod/src/devices/Devices.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/Devices.cpp
rename to src/prog/domod/src/devices/Devices.cpp
diff --git a/deprecated/src/domod/src/devices/Devices.h b/src/prog/domod/src/devices/Devices.h
similarity index 100%
rename from deprecated/src/domod/src/devices/Devices.h
rename to src/prog/domod/src/devices/Devices.h
diff --git a/deprecated/src/domod/src/devices/Light.cpp b/src/prog/domod/src/devices/Light.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/Light.cpp
rename to src/prog/domod/src/devices/Light.cpp
diff --git a/deprecated/src/domod/src/devices/Light.h b/src/prog/domod/src/devices/Light.h
similarity index 100%
rename from deprecated/src/domod/src/devices/Light.h
rename to src/prog/domod/src/devices/Light.h
diff --git a/deprecated/src/domod/src/devices/LightDevice.cpp b/src/prog/domod/src/devices/LightDevice.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/LightDevice.cpp
rename to src/prog/domod/src/devices/LightDevice.cpp
diff --git a/deprecated/src/domod/src/devices/LightDevice.h b/src/prog/domod/src/devices/LightDevice.h
similarity index 100%
rename from deprecated/src/domod/src/devices/LightDevice.h
rename to src/prog/domod/src/devices/LightDevice.h
diff --git a/deprecated/src/domod/src/devices/Shutter.cpp b/src/prog/domod/src/devices/Shutter.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/Shutter.cpp
rename to src/prog/domod/src/devices/Shutter.cpp
diff --git a/deprecated/src/domod/src/devices/Shutter.h b/src/prog/domod/src/devices/Shutter.h
similarity index 100%
rename from deprecated/src/domod/src/devices/Shutter.h
rename to src/prog/domod/src/devices/Shutter.h
diff --git a/deprecated/src/domod/src/devices/ShutterDevice.cpp b/src/prog/domod/src/devices/ShutterDevice.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/ShutterDevice.cpp
rename to src/prog/domod/src/devices/ShutterDevice.cpp
diff --git a/deprecated/src/domod/src/devices/ShutterDevice.h b/src/prog/domod/src/devices/ShutterDevice.h
similarity index 100%
rename from deprecated/src/domod/src/devices/ShutterDevice.h
rename to src/prog/domod/src/devices/ShutterDevice.h
diff --git a/deprecated/src/domod/src/devices/Sprinkler.cpp b/src/prog/domod/src/devices/Sprinkler.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/Sprinkler.cpp
rename to src/prog/domod/src/devices/Sprinkler.cpp
diff --git a/deprecated/src/domod/src/devices/Sprinkler.h b/src/prog/domod/src/devices/Sprinkler.h
similarity index 100%
rename from deprecated/src/domod/src/devices/Sprinkler.h
rename to src/prog/domod/src/devices/Sprinkler.h
diff --git a/deprecated/src/domod/src/devices/SprinklerDevice.cpp b/src/prog/domod/src/devices/SprinklerDevice.cpp
similarity index 100%
rename from deprecated/src/domod/src/devices/SprinklerDevice.cpp
rename to src/prog/domod/src/devices/SprinklerDevice.cpp
diff --git a/deprecated/src/domod/src/devices/SprinklerDevice.h b/src/prog/domod/src/devices/SprinklerDevice.h
similarity index 100%
rename from deprecated/src/domod/src/devices/SprinklerDevice.h
rename to src/prog/domod/src/devices/SprinklerDevice.h
diff --git a/deprecated/src/domod/src/helpers/Strings.cpp b/src/prog/domod/src/helpers/Strings.cpp
similarity index 100%
rename from deprecated/src/domod/src/helpers/Strings.cpp
rename to src/prog/domod/src/helpers/Strings.cpp
diff --git a/deprecated/src/domod/src/helpers/Strings.h b/src/prog/domod/src/helpers/Strings.h
similarity index 100%
rename from deprecated/src/domod/src/helpers/Strings.h
rename to src/prog/domod/src/helpers/Strings.h
diff --git a/deprecated/src/domod/src/helpers/Tokenizer.cpp b/src/prog/domod/src/helpers/Tokenizer.cpp
similarity index 100%
rename from deprecated/src/domod/src/helpers/Tokenizer.cpp
rename to src/prog/domod/src/helpers/Tokenizer.cpp
diff --git a/deprecated/src/domod/src/helpers/Tokenizer.h b/src/prog/domod/src/helpers/Tokenizer.h
similarity index 100%
rename from deprecated/src/domod/src/helpers/Tokenizer.h
rename to src/prog/domod/src/helpers/Tokenizer.h
diff --git a/deprecated/src/domod/src/main.cpp b/src/prog/domod/src/main.cpp
similarity index 100%
rename from deprecated/src/domod/src/main.cpp
rename to src/prog/domod/src/main.cpp
diff --git a/deprecated/src/domod/src/models/Devices.cpp b/src/prog/domod/src/models/Devices.cpp
similarity index 100%
rename from deprecated/src/domod/src/models/Devices.cpp
rename to src/prog/domod/src/models/Devices.cpp
diff --git a/deprecated/src/domod/src/models/Devices.h b/src/prog/domod/src/models/Devices.h
similarity index 100%
rename from deprecated/src/domod/src/models/Devices.h
rename to src/prog/domod/src/models/Devices.h
diff --git a/deprecated/src/domod/src/timers/Clock.cpp b/src/prog/domod/src/timers/Clock.cpp
similarity index 100%
rename from deprecated/src/domod/src/timers/Clock.cpp
rename to src/prog/domod/src/timers/Clock.cpp
diff --git a/deprecated/src/domod/src/timers/Clock.h b/src/prog/domod/src/timers/Clock.h
similarity index 100%
rename from deprecated/src/domod/src/timers/Clock.h
rename to src/prog/domod/src/timers/Clock.h
diff --git a/deprecated/src/domod/src/timers/Event.cpp b/src/prog/domod/src/timers/Event.cpp
similarity index 100%
rename from deprecated/src/domod/src/timers/Event.cpp
rename to src/prog/domod/src/timers/Event.cpp
diff --git a/deprecated/src/domod/src/timers/Event.h b/src/prog/domod/src/timers/Event.h
similarity index 100%
rename from deprecated/src/domod/src/timers/Event.h
rename to src/prog/domod/src/timers/Event.h
diff --git a/deprecated/src/domod/src/timers/Timers.cpp b/src/prog/domod/src/timers/Timers.cpp
similarity index 100%
rename from deprecated/src/domod/src/timers/Timers.cpp
rename to src/prog/domod/src/timers/Timers.cpp
diff --git a/deprecated/src/domod/src/timers/Timers.h b/src/prog/domod/src/timers/Timers.h
similarity index 100%
rename from deprecated/src/domod/src/timers/Timers.h
rename to src/prog/domod/src/timers/Timers.h
diff --git a/deprecated/src/domod/src/ubus/capabilities.cpp b/src/prog/domod/src/ubus/capabilities.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities.cpp
rename to src/prog/domod/src/ubus/capabilities.cpp
diff --git a/deprecated/src/domod/src/ubus/capabilities.h b/src/prog/domod/src/ubus/capabilities.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities.h
rename to src/prog/domod/src/ubus/capabilities.h
diff --git a/deprecated/src/domod/src/ubus/capabilities_lights.cpp b/src/prog/domod/src/ubus/capabilities_lights.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_lights.cpp
rename to src/prog/domod/src/ubus/capabilities_lights.cpp
diff --git a/deprecated/src/domod/src/ubus/capabilities_lights.h b/src/prog/domod/src/ubus/capabilities_lights.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_lights.h
rename to src/prog/domod/src/ubus/capabilities_lights.h
diff --git a/deprecated/src/domod/src/ubus/capabilities_shutters.cpp b/src/prog/domod/src/ubus/capabilities_shutters.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_shutters.cpp
rename to src/prog/domod/src/ubus/capabilities_shutters.cpp
diff --git a/deprecated/src/domod/src/ubus/capabilities_shutters.h b/src/prog/domod/src/ubus/capabilities_shutters.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_shutters.h
rename to src/prog/domod/src/ubus/capabilities_shutters.h
diff --git a/deprecated/src/domod/src/ubus/capabilities_sprinklers.cpp b/src/prog/domod/src/ubus/capabilities_sprinklers.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_sprinklers.cpp
rename to src/prog/domod/src/ubus/capabilities_sprinklers.cpp
diff --git a/deprecated/src/domod/src/ubus/capabilities_sprinklers.h b/src/prog/domod/src/ubus/capabilities_sprinklers.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/capabilities_sprinklers.h
rename to src/prog/domod/src/ubus/capabilities_sprinklers.h
diff --git a/deprecated/src/domod/src/ubus/speach_command.cpp b/src/prog/domod/src/ubus/speach_command.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/speach_command.cpp
rename to src/prog/domod/src/ubus/speach_command.cpp
diff --git a/deprecated/src/domod/src/ubus/speach_command.h b/src/prog/domod/src/ubus/speach_command.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/speach_command.h
rename to src/prog/domod/src/ubus/speach_command.h
diff --git a/deprecated/src/domod/src/ubus/timers.cpp b/src/prog/domod/src/ubus/timers.cpp
similarity index 100%
rename from deprecated/src/domod/src/ubus/timers.cpp
rename to src/prog/domod/src/ubus/timers.cpp
diff --git a/deprecated/src/domod/src/ubus/timers.h b/src/prog/domod/src/ubus/timers.h
similarity index 100%
rename from deprecated/src/domod/src/ubus/timers.h
rename to src/prog/domod/src/ubus/timers.h
diff --git a/deprecated/src/restd/builders/cmake/CMakeLists.txt b/src/prog/restd/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/src/restd/builders/cmake/CMakeLists.txt
rename to src/prog/restd/builders/cmake/CMakeLists.txt
diff --git a/deprecated/src/restd/doc.md b/src/prog/restd/doc.md
similarity index 100%
rename from deprecated/src/restd/doc.md
rename to src/prog/restd/doc.md
diff --git a/deprecated/src/restd/doc/Makefile b/src/prog/restd/doc/Makefile
similarity index 100%
rename from deprecated/src/restd/doc/Makefile
rename to src/prog/restd/doc/Makefile
diff --git a/deprecated/src/restd/doc/source/about-the-api.rst b/src/prog/restd/doc/source/about-the-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/about-the-api.rst
rename to src/prog/restd/doc/source/about-the-api.rst
diff --git a/deprecated/src/restd/doc/source/alarm-api.rst b/src/prog/restd/doc/source/alarm-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/alarm-api.rst
rename to src/prog/restd/doc/source/alarm-api.rst
diff --git a/deprecated/src/restd/doc/source/api-models.rst b/src/prog/restd/doc/source/api-models.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/api-models.rst
rename to src/prog/restd/doc/source/api-models.rst
diff --git a/deprecated/src/restd/doc/source/api-reference.rst b/src/prog/restd/doc/source/api-reference.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/api-reference.rst
rename to src/prog/restd/doc/source/api-reference.rst
diff --git a/deprecated/src/restd/doc/source/conf.py b/src/prog/restd/doc/source/conf.py
similarity index 100%
rename from deprecated/src/restd/doc/source/conf.py
rename to src/prog/restd/doc/source/conf.py
diff --git a/deprecated/src/restd/doc/source/device-discovery.rst b/src/prog/restd/doc/source/device-discovery.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/device-discovery.rst
rename to src/prog/restd/doc/source/device-discovery.rst
diff --git a/deprecated/src/restd/doc/source/hardware-api.rst b/src/prog/restd/doc/source/hardware-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/hardware-api.rst
rename to src/prog/restd/doc/source/hardware-api.rst
diff --git a/deprecated/src/restd/doc/source/hidden_code_block.py b/src/prog/restd/doc/source/hidden_code_block.py
similarity index 100%
rename from deprecated/src/restd/doc/source/hidden_code_block.py
rename to src/prog/restd/doc/source/hidden_code_block.py
diff --git a/deprecated/src/restd/doc/source/history.rst b/src/prog/restd/doc/source/history.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/history.rst
rename to src/prog/restd/doc/source/history.rst
diff --git a/deprecated/src/restd/doc/source/index.rst b/src/prog/restd/doc/source/index.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/index.rst
rename to src/prog/restd/doc/source/index.rst
diff --git a/deprecated/src/restd/doc/source/light-api.rst b/src/prog/restd/doc/source/light-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/light-api.rst
rename to src/prog/restd/doc/source/light-api.rst
diff --git a/deprecated/src/restd/doc/source/mixer-api.rst b/src/prog/restd/doc/source/mixer-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/mixer-api.rst
rename to src/prog/restd/doc/source/mixer-api.rst
diff --git a/deprecated/src/restd/doc/source/network-api.rst b/src/prog/restd/doc/source/network-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/network-api.rst
rename to src/prog/restd/doc/source/network-api.rst
diff --git a/deprecated/src/restd/doc/source/player-api.rst b/src/prog/restd/doc/source/player-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/player-api.rst
rename to src/prog/restd/doc/source/player-api.rst
diff --git a/deprecated/src/restd/doc/source/private-api.rst b/src/prog/restd/doc/source/private-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/private-api.rst
rename to src/prog/restd/doc/source/private-api.rst
diff --git a/deprecated/src/restd/doc/source/songqueue-api.rst b/src/prog/restd/doc/source/songqueue-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/songqueue-api.rst
rename to src/prog/restd/doc/source/songqueue-api.rst
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/__init__.py b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/__init__.py
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/__init__.py
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/__init__.py
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/breadcrumbs.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/breadcrumbs.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/breadcrumbs.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/breadcrumbs.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/footer.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/footer.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/footer.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/footer.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout_old.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout_old.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout_old.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/layout_old.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/search.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/search.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/search.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/search.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/searchbox.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/searchbox.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/searchbox.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/searchbox.html
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/badge_only.css b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/badge_only.css
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/badge_only.css
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/badge_only.css
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/theme.css b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/theme.css
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/theme.css
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/css/theme.css
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/FontAwesome.otf
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.eot
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.svg
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.ttf
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/fonts/fontawesome-webfont.woff
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/js/theme.js b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/js/theme.js
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/js/theme.js
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/static/js/theme.js
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/theme.conf b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/theme.conf
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/theme.conf
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/theme.conf
diff --git a/deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/versions.html b/src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/versions.html
similarity index 100%
rename from deprecated/src/restd/doc/source/sphinx_templates/sphinx_rtd_theme/versions.html
rename to src/prog/restd/doc/source/sphinx_templates/sphinx_rtd_theme/versions.html
diff --git a/deprecated/src/restd/doc/source/system-api.rst b/src/prog/restd/doc/source/system-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/system-api.rst
rename to src/prog/restd/doc/source/system-api.rst
diff --git a/deprecated/src/restd/doc/source/understanding-the-api.rst b/src/prog/restd/doc/source/understanding-the-api.rst
similarity index 100%
rename from deprecated/src/restd/doc/source/understanding-the-api.rst
rename to src/prog/restd/doc/source/understanding-the-api.rst
diff --git a/deprecated/src/restd/src/authorize.cpp b/src/prog/restd/src/authorize.cpp
similarity index 100%
rename from deprecated/src/restd/src/authorize.cpp
rename to src/prog/restd/src/authorize.cpp
diff --git a/deprecated/src/restd/src/authorize.h b/src/prog/restd/src/authorize.h
similarity index 100%
rename from deprecated/src/restd/src/authorize.h
rename to src/prog/restd/src/authorize.h
diff --git a/deprecated/src/restd/src/main.cpp b/src/prog/restd/src/main.cpp
similarity index 100%
rename from deprecated/src/restd/src/main.cpp
rename to src/prog/restd/src/main.cpp
diff --git a/deprecated/src/restd/src/message.cpp b/src/prog/restd/src/message.cpp
similarity index 100%
rename from deprecated/src/restd/src/message.cpp
rename to src/prog/restd/src/message.cpp
diff --git a/deprecated/src/restd/src/message.h b/src/prog/restd/src/message.h
similarity index 100%
rename from deprecated/src/restd/src/message.h
rename to src/prog/restd/src/message.h
diff --git a/deprecated/src/restd/src/restd.h b/src/prog/restd/src/restd.h
similarity index 100%
rename from deprecated/src/restd/src/restd.h
rename to src/prog/restd/src/restd.h
diff --git a/deprecated/src/restd/src/routes/ExitHandler.cpp b/src/prog/restd/src/routes/ExitHandler.cpp
similarity index 100%
rename from deprecated/src/restd/src/routes/ExitHandler.cpp
rename to src/prog/restd/src/routes/ExitHandler.cpp
diff --git a/deprecated/src/restd/src/routes/ExitHandler.h b/src/prog/restd/src/routes/ExitHandler.h
similarity index 100%
rename from deprecated/src/restd/src/routes/ExitHandler.h
rename to src/prog/restd/src/routes/ExitHandler.h
diff --git a/deprecated/src/restd/src/routes/UbusHandler.cpp b/src/prog/restd/src/routes/UbusHandler.cpp
similarity index 100%
rename from deprecated/src/restd/src/routes/UbusHandler.cpp
rename to src/prog/restd/src/routes/UbusHandler.cpp
diff --git a/deprecated/src/restd/src/routes/UbusHandler.h b/src/prog/restd/src/routes/UbusHandler.h
similarity index 100%
rename from deprecated/src/restd/src/routes/UbusHandler.h
rename to src/prog/restd/src/routes/UbusHandler.h
diff --git a/deprecated/src/restd/src/session.cpp b/src/prog/restd/src/session.cpp
similarity index 100%
rename from deprecated/src/restd/src/session.cpp
rename to src/prog/restd/src/session.cpp
diff --git a/deprecated/src/restd/src/session.h b/src/prog/restd/src/session.h
similarity index 100%
rename from deprecated/src/restd/src/session.h
rename to src/prog/restd/src/session.h