diff --git a/.gitignore b/.gitignore
index 2cb00e99..a6c24404 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,4 +8,4 @@ config.py
 
 .ropeproject/*
 
-attract/application/static/storage/
+pillar/application/static/storage/
diff --git a/docker/attract-db/Dockerfile b/docker/Dockerfile
similarity index 59%
rename from docker/attract-db/Dockerfile
rename to docker/Dockerfile
index cc1985eb..a6038034 100644
--- a/docker/attract-db/Dockerfile
+++ b/docker/Dockerfile
@@ -10,17 +10,18 @@ nano
 
 RUN mkdir /data
 RUN mkdir /data/www
-RUN mkdir /data/www/attract_server_dev
-#RUN git clone https://github.com/armadillica/attract.git /data/www/attract
+RUN mkdir /data/www/pillar_dev
 
 RUN pip install virtualenv
 RUN virtualenv /data/venv
 #RUN . /data/venv/bin/activate
 #RUN pip install -r requirements.txt
 
-VOLUME /data/www/attract_server_dev
+VOLUME /data/www/pillar_dev
+
+ENV MONGO_HOST='mongo_pillar'
 
 EXPOSE 5000
 
-ENTRYPOINT . /data/venv/bin/activate; \
-cd /data/www/attract_server_dev; \
+#ENTRYPOINT . /data/venv/bin/activate; \
+#cd /data/www/pillar_dev; \
diff --git a/docker/attract/Dockerfile b/docker/attract/Dockerfile
deleted file mode 100644
index a36f61e9..00000000
--- a/docker/attract/Dockerfile
+++ /dev/null
@@ -1,18 +0,0 @@
-FROM ubuntu:14.04
-MAINTAINER Eibriel <eibriel@eibriel.com>
-
-RUN mkdir attract
-
-RUN apt-get update && apt-get install -y \
-git
-
-RUN git clone https://github.com/fsiddi/attract.git /attract/
-
-RUN apt-get update && apt-get install -y \
-python-pip
-
-RUN pip install -r /attract/requirements.txt
-
-EXPOSE 5000
-
-CMD ["python", "/attract/attract/manage.py", "runserver"]
diff --git a/attract/application/__init__.py b/pillar/application/__init__.py
similarity index 100%
rename from attract/application/__init__.py
rename to pillar/application/__init__.py
diff --git a/attract/application/file_server.py b/pillar/application/file_server.py
similarity index 100%
rename from attract/application/file_server.py
rename to pillar/application/file_server.py
diff --git a/attract/application/pre_hooks.py b/pillar/application/pre_hooks.py
similarity index 100%
rename from attract/application/pre_hooks.py
rename to pillar/application/pre_hooks.py
diff --git a/attract/application/static/.webassets-cache/.gitignore b/pillar/application/static/.webassets-cache/.gitignore
similarity index 100%
rename from attract/application/static/.webassets-cache/.gitignore
rename to pillar/application/static/.webassets-cache/.gitignore
diff --git a/attract/application/static/placeholder b/pillar/application/static/placeholder
similarity index 100%
rename from attract/application/static/placeholder
rename to pillar/application/static/placeholder
diff --git a/attract/config.py.example b/pillar/config.py.example
similarity index 100%
rename from attract/config.py.example
rename to pillar/config.py.example
diff --git a/attract/manage.py b/pillar/manage.py
similarity index 100%
rename from attract/manage.py
rename to pillar/manage.py
diff --git a/attract/settings.py b/pillar/settings.py
similarity index 100%
rename from attract/settings.py
rename to pillar/settings.py
diff --git a/attract/test_attract.py b/pillar/test_attract.py
similarity index 100%
rename from attract/test_attract.py
rename to pillar/test_attract.py
diff --git a/readme.md b/readme.md
index d04254fc..d6fa4055 100644
--- a/readme.md
+++ b/readme.md
@@ -1,6 +1,5 @@
-Attract - Flask edition
-========================
+Pillar
+======
 
-At the moment this is just an experimental branch. I am going to work on it further in the coming weeks and investigate if it makes a good candidate to replace the current codeigniter-based Attract.
-
-Installation instructions, docs and roadmap willl be published in a few days as well.
+This is the latest iteration on the Attract project. We are building a unified
+framework called Pillar. Pillar will combine Blender Cloud and Attract.