diff --git a/basic-runtimes.sh b/basic-runtimes.sh
old mode 100644
new mode 100755
index 7e8fb08..2b137d9
--- a/basic-runtimes.sh
+++ b/basic-runtimes.sh
@@ -3,9 +3,9 @@
 SOURCE_DIR=$(realpath $(dirname "${0}"))/basic-runtimes
 
 # Build Docker images
-docker build -t java ${SOURCE_DIR}/java.Dockerfile
-docker build -t php ${SOURCE_DIR}/php.Dockerfile
-docker build -t python2 ${SOURCE_DIR}/python2.Dockerfile
-docker build -t python3 ${SOURCE_DIR}/python3.Dockerfile
-docker build -t ruby ${SOURCE_DIR}/ruby.Dockerfile
-docker build -t tomcat ${SOURCE_DIR}/tomcat.Dockerfile
+docker build -t java ${SOURCE_DIR}/java
+docker build -t php ${SOURCE_DIR}/php
+docker build -t python2 ${SOURCE_DIR}/python2
+docker build -t python3 ${SOURCE_DIR}/python3
+docker build -t ruby ${SOURCE_DIR}/ruby
+docker build -t tomcat ${SOURCE_DIR}/tomcat
diff --git a/basic-runtimes/java.Dockerfile b/basic-runtimes/java/Dockerfile
similarity index 100%
rename from basic-runtimes/java.Dockerfile
rename to basic-runtimes/java/Dockerfile
diff --git a/basic-runtimes/php.Dockerfile b/basic-runtimes/php/Dockerfile
similarity index 100%
rename from basic-runtimes/php.Dockerfile
rename to basic-runtimes/php/Dockerfile
diff --git a/basic-runtimes/python2.Dockerfile b/basic-runtimes/python2/Dockerfile
similarity index 100%
rename from basic-runtimes/python2.Dockerfile
rename to basic-runtimes/python2/Dockerfile
diff --git a/basic-runtimes/python3.Dockerfile b/basic-runtimes/python3/Dockerfile
similarity index 100%
rename from basic-runtimes/python3.Dockerfile
rename to basic-runtimes/python3/Dockerfile
diff --git a/basic-runtimes/ruby.Dockerfile b/basic-runtimes/ruby/Dockerfile
similarity index 100%
rename from basic-runtimes/ruby.Dockerfile
rename to basic-runtimes/ruby/Dockerfile
diff --git a/basic-runtimes/tomcat.Dockerfile b/basic-runtimes/tomcat/Dockerfile
similarity index 96%
rename from basic-runtimes/tomcat.Dockerfile
rename to basic-runtimes/tomcat/Dockerfile
index dd9787f..45e0dc6 100644
--- a/basic-runtimes/tomcat.Dockerfile
+++ b/basic-runtimes/tomcat/Dockerfile
@@ -12,4 +12,4 @@ RUN \
  && rm -rf /srv/tomcat/webapps/ROOT /srv/tomcat/webapps/docs /srv/tomcat/webapps/examples /srv/tomcat/webapps/host-manager /srv/tomcat/webapps/manager \
  && rm -f /tmp/apache-tomcat-8.tgz
 
-COPY tomcat.docker/ /
+COPY docker/ /
diff --git a/basic-runtimes/tomcat.docker/srv/tomcat/bin/setenv.sh b/basic-runtimes/tomcat/docker/srv/tomcat/bin/setenv.sh
similarity index 100%
rename from basic-runtimes/tomcat.docker/srv/tomcat/bin/setenv.sh
rename to basic-runtimes/tomcat/docker/srv/tomcat/bin/setenv.sh
diff --git a/basic-runtimes/tomcat.docker/srv/tomcat/conf/logging.properties b/basic-runtimes/tomcat/docker/srv/tomcat/conf/logging.properties
similarity index 100%
rename from basic-runtimes/tomcat.docker/srv/tomcat/conf/logging.properties
rename to basic-runtimes/tomcat/docker/srv/tomcat/conf/logging.properties