diff --git a/deprecated/lib/ubuscpp/builders/cmake/CMakeLists.txt b/src/lib/ubuscpp/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/lib/ubuscpp/builders/cmake/CMakeLists.txt
rename to src/lib/ubuscpp/builders/cmake/CMakeLists.txt
diff --git a/deprecated/lib/ubuscpp/include/ubuscpp/UBusCall.h b/src/lib/ubuscpp/include/ubuscpp/UBusCall.h
similarity index 100%
rename from deprecated/lib/ubuscpp/include/ubuscpp/UBusCall.h
rename to src/lib/ubuscpp/include/ubuscpp/UBusCall.h
diff --git a/deprecated/lib/ubuscpp/include/ubuscpp/UBusCpp.h b/src/lib/ubuscpp/include/ubuscpp/UBusCpp.h
similarity index 100%
rename from deprecated/lib/ubuscpp/include/ubuscpp/UBusCpp.h
rename to src/lib/ubuscpp/include/ubuscpp/UBusCpp.h
diff --git a/deprecated/lib/ubuscpp/include/ubuscpp/UBusObject.h b/src/lib/ubuscpp/include/ubuscpp/UBusObject.h
similarity index 100%
rename from deprecated/lib/ubuscpp/include/ubuscpp/UBusObject.h
rename to src/lib/ubuscpp/include/ubuscpp/UBusObject.h
diff --git a/deprecated/lib/ubuscpp/include/ubuscpp/UBusTimer.h b/src/lib/ubuscpp/include/ubuscpp/UBusTimer.h
similarity index 100%
rename from deprecated/lib/ubuscpp/include/ubuscpp/UBusTimer.h
rename to src/lib/ubuscpp/include/ubuscpp/UBusTimer.h
diff --git a/deprecated/lib/ubuscpp/src/UBusCall.cpp b/src/lib/ubuscpp/src/UBusCall.cpp
similarity index 100%
rename from deprecated/lib/ubuscpp/src/UBusCall.cpp
rename to src/lib/ubuscpp/src/UBusCall.cpp
diff --git a/deprecated/lib/ubuscpp/src/UBusObject.cpp b/src/lib/ubuscpp/src/UBusObject.cpp
similarity index 100%
rename from deprecated/lib/ubuscpp/src/UBusObject.cpp
rename to src/lib/ubuscpp/src/UBusObject.cpp
diff --git a/deprecated/lib/ubuscpp/src/UBusTimer.cpp b/src/lib/ubuscpp/src/UBusTimer.cpp
similarity index 100%
rename from deprecated/lib/ubuscpp/src/UBusTimer.cpp
rename to src/lib/ubuscpp/src/UBusTimer.cpp
diff --git a/deprecated/lib/ubuscpp/src/common.h b/src/lib/ubuscpp/src/common.h
similarity index 100%
rename from deprecated/lib/ubuscpp/src/common.h
rename to src/lib/ubuscpp/src/common.h
diff --git a/deprecated/src/chacond/builders/cmake/CMakeLists.txt b/src/prog/chacond/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/src/chacond/builders/cmake/CMakeLists.txt
rename to src/prog/chacond/builders/cmake/CMakeLists.txt
diff --git a/deprecated/src/chacond/libwiringPi.a b/src/prog/chacond/libwiringPi.a
similarity index 100%
rename from deprecated/src/chacond/libwiringPi.a
rename to src/prog/chacond/libwiringPi.a
diff --git a/deprecated/src/chacond/radioEmission b/src/prog/chacond/radioEmission
similarity index 100%
rename from deprecated/src/chacond/radioEmission
rename to src/prog/chacond/radioEmission
diff --git a/deprecated/src/chacond/radioEmission.cpp b/src/prog/chacond/radioEmission.cpp
similarity index 100%
rename from deprecated/src/chacond/radioEmission.cpp
rename to src/prog/chacond/radioEmission.cpp
diff --git a/deprecated/src/chacond/radioReception.cpp b/src/prog/chacond/radioReception.cpp
similarity index 100%
rename from deprecated/src/chacond/radioReception.cpp
rename to src/prog/chacond/radioReception.cpp
diff --git a/deprecated/src/chacond/src/Chacon.c b/src/prog/chacond/src/Chacon.c
similarity index 100%
rename from deprecated/src/chacond/src/Chacon.c
rename to src/prog/chacond/src/Chacon.c
diff --git a/deprecated/src/chacond/src/UBusModel.c b/src/prog/chacond/src/UBusModel.c
similarity index 100%
rename from deprecated/src/chacond/src/UBusModel.c
rename to src/prog/chacond/src/UBusModel.c
diff --git a/deprecated/src/chacond/src/UbusModel.h b/src/prog/chacond/src/UbusModel.h
similarity index 100%
rename from deprecated/src/chacond/src/UbusModel.h
rename to src/prog/chacond/src/UbusModel.h
diff --git a/deprecated/src/chacond/src/chacon.h b/src/prog/chacond/src/chacon.h
similarity index 100%
rename from deprecated/src/chacond/src/chacon.h
rename to src/prog/chacond/src/chacon.h
diff --git a/deprecated/src/chacond/src/main.c b/src/prog/chacond/src/main.c
similarity index 100%
rename from deprecated/src/chacond/src/main.c
rename to src/prog/chacond/src/main.c
diff --git a/deprecated/src/chacond/wiringPi.h b/src/prog/chacond/wiringPi.h
similarity index 100%
rename from deprecated/src/chacond/wiringPi.h
rename to src/prog/chacond/wiringPi.h
diff --git a/deprecated/src/sprinklersd/Readme.md b/src/prog/sprinklersd/Readme.md
similarity index 100%
rename from deprecated/src/sprinklersd/Readme.md
rename to src/prog/sprinklersd/Readme.md
diff --git a/deprecated/src/sprinklersd/builders/cmake/CMakeLists.txt b/src/prog/sprinklersd/builders/cmake/CMakeLists.txt
similarity index 100%
rename from deprecated/src/sprinklersd/builders/cmake/CMakeLists.txt
rename to src/prog/sprinklersd/builders/cmake/CMakeLists.txt
diff --git a/deprecated/src/sprinklersd/src/UbusSprinklerModel.cpp b/src/prog/sprinklersd/src/UbusSprinklerModel.cpp
similarity index 100%
rename from deprecated/src/sprinklersd/src/UbusSprinklerModel.cpp
rename to src/prog/sprinklersd/src/UbusSprinklerModel.cpp
diff --git a/deprecated/src/sprinklersd/src/UbusSprinklerModel.h b/src/prog/sprinklersd/src/UbusSprinklerModel.h
similarity index 100%
rename from deprecated/src/sprinklersd/src/UbusSprinklerModel.h
rename to src/prog/sprinklersd/src/UbusSprinklerModel.h
diff --git a/deprecated/src/sprinklersd/src/main.cpp b/src/prog/sprinklersd/src/main.cpp
similarity index 100%
rename from deprecated/src/sprinklersd/src/main.cpp
rename to src/prog/sprinklersd/src/main.cpp
diff --git a/deprecated/src/sprinklersd/src/sprinklers.cpp b/src/prog/sprinklersd/src/sprinklers.cpp
similarity index 100%
rename from deprecated/src/sprinklersd/src/sprinklers.cpp
rename to src/prog/sprinklersd/src/sprinklers.cpp
diff --git a/deprecated/src/sprinklersd/src/sprinklers.h b/src/prog/sprinklersd/src/sprinklers.h
similarity index 100%
rename from deprecated/src/sprinklersd/src/sprinklers.h
rename to src/prog/sprinklersd/src/sprinklers.h