diff --git a/common/Dockerfile b/ciao-common/Dockerfile
similarity index 100%
rename from common/Dockerfile
rename to ciao-common/Dockerfile
diff --git a/common/README.md b/ciao-common/README.md
similarity index 100%
rename from common/README.md
rename to ciao-common/README.md
diff --git a/common/bashrc b/ciao-common/bashrc
similarity index 100%
rename from common/bashrc
rename to ciao-common/bashrc
diff --git a/common/environment b/ciao-common/environment
similarity index 100%
rename from common/environment
rename to ciao-common/environment
diff --git a/common/openssl.cnf b/ciao-common/openssl.cnf
similarity index 100%
rename from common/openssl.cnf
rename to ciao-common/openssl.cnf
diff --git a/scheduler/Dockerfile b/ciao-scheduler/Dockerfile
similarity index 100%
rename from scheduler/Dockerfile
rename to ciao-scheduler/Dockerfile
diff --git a/scheduler/README.md b/ciao-scheduler/README.md
similarity index 100%
rename from scheduler/README.md
rename to ciao-scheduler/README.md
diff --git a/scheduler/ciaorc b/ciao-scheduler/ciaorc
similarity index 100%
rename from scheduler/ciaorc
rename to ciao-scheduler/ciaorc
diff --git a/scheduler/configuration.yaml b/ciao-scheduler/configuration.yaml
similarity index 100%
rename from scheduler/configuration.yaml
rename to ciao-scheduler/configuration.yaml
diff --git a/scheduler/scheduler.sh b/ciao-scheduler/scheduler.sh
similarity index 100%
rename from scheduler/scheduler.sh
rename to ciao-scheduler/scheduler.sh