diff --git a/ckan-base/2.7/Dockerfile b/images/ckan-base/2.7/Dockerfile
similarity index 100%
rename from ckan-base/2.7/Dockerfile
rename to images/ckan-base/2.7/Dockerfile
diff --git a/ckan-base/2.7/setup/prerun.py b/images/ckan-base/2.7/setup/prerun.py
similarity index 100%
rename from ckan-base/2.7/setup/prerun.py
rename to images/ckan-base/2.7/setup/prerun.py
diff --git a/ckan-base/2.7/setup/start_ckan.sh b/images/ckan-base/2.7/setup/start_ckan.sh
similarity index 100%
rename from ckan-base/2.7/setup/start_ckan.sh
rename to images/ckan-base/2.7/setup/start_ckan.sh
diff --git a/ckan-base/2.7/setup/supervisor.worker.conf b/images/ckan-base/2.7/setup/supervisor.worker.conf
similarity index 100%
rename from ckan-base/2.7/setup/supervisor.worker.conf
rename to images/ckan-base/2.7/setup/supervisor.worker.conf
diff --git a/ckan-base/2.7/setup/supervisord.conf b/images/ckan-base/2.7/setup/supervisord.conf
similarity index 100%
rename from ckan-base/2.7/setup/supervisord.conf
rename to images/ckan-base/2.7/setup/supervisord.conf
diff --git a/ckan-base/2.7/setup/uwsgi.conf b/images/ckan-base/2.7/setup/uwsgi.conf
similarity index 100%
rename from ckan-base/2.7/setup/uwsgi.conf
rename to images/ckan-base/2.7/setup/uwsgi.conf
diff --git a/ckan-base/2.8/Dockerfile b/images/ckan-base/2.8/Dockerfile
similarity index 100%
rename from ckan-base/2.8/Dockerfile
rename to images/ckan-base/2.8/Dockerfile
diff --git a/ckan-base/2.8/setup/prerun.py b/images/ckan-base/2.8/setup/prerun.py
similarity index 100%
rename from ckan-base/2.8/setup/prerun.py
rename to images/ckan-base/2.8/setup/prerun.py
diff --git a/ckan-base/2.8/setup/start_ckan.sh b/images/ckan-base/2.8/setup/start_ckan.sh
similarity index 100%
rename from ckan-base/2.8/setup/start_ckan.sh
rename to images/ckan-base/2.8/setup/start_ckan.sh
diff --git a/ckan-base/2.8/setup/supervisor.worker.conf b/images/ckan-base/2.8/setup/supervisor.worker.conf
similarity index 100%
rename from ckan-base/2.8/setup/supervisor.worker.conf
rename to images/ckan-base/2.8/setup/supervisor.worker.conf
diff --git a/ckan-base/2.8/setup/supervisord.conf b/images/ckan-base/2.8/setup/supervisord.conf
similarity index 100%
rename from ckan-base/2.8/setup/supervisord.conf
rename to images/ckan-base/2.8/setup/supervisord.conf
diff --git a/ckan-base/2.8/setup/uwsgi.conf b/images/ckan-base/2.8/setup/uwsgi.conf
similarity index 100%
rename from ckan-base/2.8/setup/uwsgi.conf
rename to images/ckan-base/2.8/setup/uwsgi.conf
diff --git a/ckan-base/2.9/Dockerfile b/images/ckan-base/2.9/Dockerfile
similarity index 100%
rename from ckan-base/2.9/Dockerfile
rename to images/ckan-base/2.9/Dockerfile
diff --git a/ckan-base/2.9/setup/ckan-uwsgi.ini b/images/ckan-base/2.9/setup/ckan-uwsgi.ini
similarity index 100%
rename from ckan-base/2.9/setup/ckan-uwsgi.ini
rename to images/ckan-base/2.9/setup/ckan-uwsgi.ini
diff --git a/ckan-base/2.9/setup/prerun.py b/images/ckan-base/2.9/setup/prerun.py
similarity index 100%
rename from ckan-base/2.9/setup/prerun.py
rename to images/ckan-base/2.9/setup/prerun.py
diff --git a/ckan-base/2.9/setup/start_ckan.sh b/images/ckan-base/2.9/setup/start_ckan.sh
similarity index 100%
rename from ckan-base/2.9/setup/start_ckan.sh
rename to images/ckan-base/2.9/setup/start_ckan.sh
diff --git a/ckan-base/2.9/setup/supervisor.worker.conf b/images/ckan-base/2.9/setup/supervisor.worker.conf
similarity index 100%
rename from ckan-base/2.9/setup/supervisor.worker.conf
rename to images/ckan-base/2.9/setup/supervisor.worker.conf
diff --git a/ckan-base/2.9/setup/supervisord.conf b/images/ckan-base/2.9/setup/supervisord.conf
similarity index 100%
rename from ckan-base/2.9/setup/supervisord.conf
rename to images/ckan-base/2.9/setup/supervisord.conf
diff --git a/ckan-base/2.9/setup/wsgi.py b/images/ckan-base/2.9/setup/wsgi.py
similarity index 100%
rename from ckan-base/2.9/setup/wsgi.py
rename to images/ckan-base/2.9/setup/wsgi.py
diff --git a/ckan-dev/2.9/Dockerfile b/images/ckan-dev/2.9/Dockerfile
similarity index 100%
rename from ckan-dev/2.9/Dockerfile
rename to images/ckan-dev/2.9/Dockerfile
diff --git a/ckan-dev/README b/images/ckan-dev/README
similarity index 100%
rename from ckan-dev/README
rename to images/ckan-dev/README
diff --git a/ckan-dev/setup/start_ckan_development.sh b/images/ckan-dev/setup/start_ckan_development.sh
similarity index 100%
rename from ckan-dev/setup/start_ckan_development.sh
rename to images/ckan-dev/setup/start_ckan_development.sh