diff --git a/docker-contents/CONTRIBUTORS.rst b/docker/CONTRIBUTORS.rst
similarity index 100%
rename from docker-contents/CONTRIBUTORS.rst
rename to docker/CONTRIBUTORS.rst
diff --git a/docker-contents/LICENSE.rst b/docker/LICENSE.rst
similarity index 100%
rename from docker-contents/LICENSE.rst
rename to docker/LICENSE.rst
diff --git a/docker-contents/README.rst b/docker/README.rst
similarity index 92%
rename from docker-contents/README.rst
rename to docker/README.rst
index 43346c7..c1e44ac 100644
--- a/docker-contents/README.rst
+++ b/docker/README.rst
@@ -16,14 +16,14 @@ Running this will get the latest version of pinry itself::
 
   git clone https://github.com/pinry/pinry
   cd pinry
-  ./docker-contents/bootstrap.sh
+  ./docker/bootstrap.sh
 
 Now you can start your container by command like this::
 
   # this is where your database and pins localted
   mkdir data
   # use absolute path for docker to avoid using default data-volume (we use directory instead)
-  ./docker-contents/start_docker.sh `readlink -f data`
+  ./docker/start_docker.sh `readlink -f data`
 
 Please visit `http://your-ip` to visit your instance and register a new account, enjoy it.
 
@@ -41,7 +41,7 @@ Building docker-pinry again
 
 Running this will build you a docker image with the latest version of pinry::
 
-  ./docker-contents/build_docker.sh
+  ./docker/build_docker.sh
 
 
 Running docker-pinry in manual way
@@ -59,12 +59,12 @@ Then you have two choice to run docker-pinry
 
 Fist one, with automaticlly configured default arguments::
 
-  ./docker-contents/start_docker.sh /mnt/pinry
+  ./docker/start_docker.sh /mnt/pinry
 
 
 Second one, start docker by hand with customized arguments::
 
-  SETTINGS_PATH=$(readlink -f docker-contents/pinry/local_settings.py) \
+  SETTINGS_PATH=$(readlink -f docker/pinry/local_settings.py) \
   DATA_PATH=$(readlink -f /mnt/pinry) \
   sudo docker run -d=true -p=10000:80 \
     -v=${DATA_PATH}:/data \
@@ -86,7 +86,7 @@ Running docker-pinry with docker-compose
 Just config your ``docker-compose.yml`` and then run::
 
     sudo pip install -U docker-compose
-    sudo docker-compose --project-directory docker-contents up -d
+    sudo docker-compose --project-directory docker up -d
 
 
 Notes on the run commands
@@ -132,4 +132,4 @@ stronger database solution.
 
 .. _official getting started guide: http://www.docker.io/gettingstarted/
 .. _website: http://getpinry.com/
-.. _additional pinry configuration settings: https://github.com/pinry/pinry/blob/master/docker-contents/pinry/local_settings.example.py
+.. _additional pinry configuration settings: https://github.com/pinry/pinry/blob/master/docker/pinry/local_settings.example.py
diff --git a/docker-contents/bootstrap.sh b/docker/bootstrap.sh
similarity index 100%
rename from docker-contents/bootstrap.sh
rename to docker/bootstrap.sh
diff --git a/docker-contents/build_docker.sh b/docker/build_docker.sh
similarity index 100%
rename from docker-contents/build_docker.sh
rename to docker/build_docker.sh
diff --git a/docker-contents/docker-compose.example.yml b/docker/docker-compose.example.yml
similarity index 100%
rename from docker-contents/docker-compose.example.yml
rename to docker/docker-compose.example.yml
diff --git a/docker-contents/nginx/nginx.conf b/docker/nginx/nginx.conf
similarity index 100%
rename from docker-contents/nginx/nginx.conf
rename to docker/nginx/nginx.conf
diff --git a/docker-contents/nginx/sites-enabled/default b/docker/nginx/sites-enabled/default
similarity index 100%
rename from docker-contents/nginx/sites-enabled/default
rename to docker/nginx/sites-enabled/default
diff --git a/docker-contents/pinry/.gitignore b/docker/pinry/.gitignore
similarity index 100%
rename from docker-contents/pinry/.gitignore
rename to docker/pinry/.gitignore
diff --git a/docker-contents/pinry/local_settings.example.py b/docker/pinry/local_settings.example.py
similarity index 100%
rename from docker-contents/pinry/local_settings.example.py
rename to docker/pinry/local_settings.example.py
diff --git a/docker-contents/scripts/_start_gunicorn.sh b/docker/scripts/_start_gunicorn.sh
similarity index 100%
rename from docker-contents/scripts/_start_gunicorn.sh
rename to docker/scripts/_start_gunicorn.sh
diff --git a/docker-contents/scripts/gen_key.sh b/docker/scripts/gen_key.sh
similarity index 100%
rename from docker-contents/scripts/gen_key.sh
rename to docker/scripts/gen_key.sh
diff --git a/docker-contents/scripts/start.sh b/docker/scripts/start.sh
similarity index 100%
rename from docker-contents/scripts/start.sh
rename to docker/scripts/start.sh
diff --git a/docker-contents/start_docker.sh b/docker/start_docker.sh
similarity index 100%
rename from docker-contents/start_docker.sh
rename to docker/start_docker.sh
diff --git a/docker-contents/tests/http_status_code.sh b/docker/tests/http_status_code.sh
similarity index 100%
rename from docker-contents/tests/http_status_code.sh
rename to docker/tests/http_status_code.sh
diff --git a/docker-contents/tests/test.sh b/docker/tests/test.sh
similarity index 100%
rename from docker-contents/tests/test.sh
rename to docker/tests/test.sh