diff --git a/.circleci/config.yml b/.circleci/config.yml
index 837e97e42..4d134bb92 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -56,7 +56,7 @@ jobs:
           command: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - run:
           name: Build images
-          path: ci
+          path: architecture/ci
           command: make build_browser PUSH=1
 
   push_docker_android:
@@ -75,7 +75,7 @@ jobs:
           command: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - run:
           name: Build images
-          path: ci
+          path: architecture/ci
           command: make build_android PUSH=1
 
   build_core:
@@ -467,7 +467,7 @@ jobs:
       - run:
           name: set checksums
           command: |
-            KT_DOCK=$(md5sum ci/android.dockerfile | cut -d' ' -f1)
+            KT_DOCK=$(md5sum architecture/ci/android.dockerfile | cut -d' ' -f1)
             KT_MAIN=$(md5sum android/build.gradle | cut -d' ' -f1)
             KT_UTIL=$(md5sum android/TestUtils/build.gradle | cut -d' ' -f1)
             KT_LIBR=$(md5sum android/Lib/build.gradle | cut -d' ' -f1)
diff --git a/.circleci/pieces/03-push-docker-browser.yml b/.circleci/pieces/03-push-docker-browser.yml
index d41bbb8e5..46bd44e2d 100644
--- a/.circleci/pieces/03-push-docker-browser.yml
+++ b/.circleci/pieces/03-push-docker-browser.yml
@@ -14,6 +14,6 @@
           command: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - run:
           name: Build images
-          path: ci
+          path: architecture/ci
           command: make build_browser PUSH=1
 
diff --git a/.circleci/pieces/04-push-docker-android.yml b/.circleci/pieces/04-push-docker-android.yml
index eb06c1fb8..f9b955250 100644
--- a/.circleci/pieces/04-push-docker-android.yml
+++ b/.circleci/pieces/04-push-docker-android.yml
@@ -14,6 +14,6 @@
           command: docker login -u $DOCKER_USER -p $DOCKER_PASSWORD
       - run:
           name: Build images
-          path: ci
+          path: architecture/ci
           command: make build_android PUSH=1
 
diff --git a/.circleci/pieces/18-build-android.yml b/.circleci/pieces/18-build-android.yml
index 7188b4f81..744666f4d 100644
--- a/.circleci/pieces/18-build-android.yml
+++ b/.circleci/pieces/18-build-android.yml
@@ -11,7 +11,7 @@
       - run:
           name: set checksums
           command: |
-            KT_DOCK=$(md5sum ci/android.dockerfile | cut -d' ' -f1)
+            KT_DOCK=$(md5sum architecture/ci/android.dockerfile | cut -d' ' -f1)
             KT_MAIN=$(md5sum android/build.gradle | cut -d' ' -f1)
             KT_UTIL=$(md5sum android/TestUtils/build.gradle | cut -d' ' -f1)
             KT_LIBR=$(md5sum android/Lib/build.gradle | cut -d' ' -f1)
diff --git a/ci/Makefile b/architecture/ci/Makefile
similarity index 100%
rename from ci/Makefile
rename to architecture/ci/Makefile
diff --git a/ci/android.dockerfile b/architecture/ci/android.dockerfile
similarity index 100%
rename from ci/android.dockerfile
rename to architecture/ci/android.dockerfile
diff --git a/ci/dfm-browser-tests.dockerfile b/architecture/ci/dfm-browser-tests.dockerfile
similarity index 100%
rename from ci/dfm-browser-tests.dockerfile
rename to architecture/ci/dfm-browser-tests.dockerfile
diff --git a/ci/echyellow b/architecture/ci/echyellow
old mode 100755
new mode 100644
similarity index 100%
rename from ci/echyellow
rename to architecture/ci/echyellow
diff --git a/ci/gradle-with-metadata b/architecture/ci/gradle-with-metadata
old mode 100755
new mode 100644
similarity index 100%
rename from ci/gradle-with-metadata
rename to architecture/ci/gradle-with-metadata
diff --git a/ci/netcore-libman-node-chrome.dockerfile b/architecture/ci/netcore-libman-node-chrome.dockerfile
similarity index 100%
rename from ci/netcore-libman-node-chrome.dockerfile
rename to architecture/ci/netcore-libman-node-chrome.dockerfile
diff --git a/ci/netcore-libman-node.dockerfile b/architecture/ci/netcore-libman-node.dockerfile
similarity index 100%
rename from ci/netcore-libman-node.dockerfile
rename to architecture/ci/netcore-libman-node.dockerfile
diff --git a/publish/Makefile b/architecture/publish/Makefile
similarity index 100%
rename from publish/Makefile
rename to architecture/publish/Makefile
diff --git a/publish/dfm-midna.dockerfile b/architecture/publish/dfm-midna.dockerfile
old mode 100755
new mode 100644
similarity index 100%
rename from publish/dfm-midna.dockerfile
rename to architecture/publish/dfm-midna.dockerfile
diff --git a/publish/dfm-robot.dockerfile b/architecture/publish/dfm-robot.dockerfile
similarity index 100%
rename from publish/dfm-robot.dockerfile
rename to architecture/publish/dfm-robot.dockerfile
diff --git a/publish/dfm-site.dockerfile b/architecture/publish/dfm-site.dockerfile
similarity index 100%
rename from publish/dfm-site.dockerfile
rename to architecture/publish/dfm-site.dockerfile