diff --git a/prestosql/README.md b/presto/README.md
similarity index 100%
rename from prestosql/README.md
rename to presto/README.md
diff --git a/presto/docker/Makefile b/presto/docker/Makefile
new file mode 100644
index 0000000..184ef98
--- /dev/null
+++ b/presto/docker/Makefile
@@ -0,0 +1,8 @@
+PRESTO_VERSION := latest
+
+.PHONY: build 
+
+build:
+	docker build --squash --build-arg PRESTO_IMAGE=prestosql/presto:${PRESTO_VERSION} -t bigtop/presto-coordinator:${PRESTO_VERSION} coordinator
+	docker build --squash --build-arg PRESTO_IMAGE=prestosql/presto:${PRESTO_VERSION} -t bigtop/presto-worker:${PRESTO_VERSION} worker
+
diff --git a/presto/docker/README.md b/presto/docker/README.md
new file mode 100644
index 0000000..b38e6ea
--- /dev/null
+++ b/presto/docker/README.md
@@ -0,0 +1,6 @@
+Buil Docker images for Presto 
+
+```
+$ make build
+
+```
diff --git a/prestosql/docker/coordinator/Dockerfile b/presto/docker/coordinator/Dockerfile
similarity index 100%
rename from prestosql/docker/coordinator/Dockerfile
rename to presto/docker/coordinator/Dockerfile
diff --git a/presto/docker/coordinator/README.md b/presto/docker/coordinator/README.md
new file mode 100755
index 0000000..b7a9625
--- /dev/null
+++ b/presto/docker/coordinator/README.md
@@ -0,0 +1,7 @@
+# Use squash !
+
+Building this image, make sure you use squash so you can gut the 12 GB file :) 
+
+docker build --squash -t bigtop/presto-coordinator:320 --build-arg PRESTO_IMAGE=prestosql/presto:320 .
+
+
diff --git a/prestosql/docker/coordinator/config.properties b/presto/docker/coordinator/config.properties
similarity index 100%
rename from prestosql/docker/coordinator/config.properties
rename to presto/docker/coordinator/config.properties
diff --git a/prestosql/docker/coordinator/jvm.config b/presto/docker/coordinator/jvm.config
similarity index 100%
rename from prestosql/docker/coordinator/jvm.config
rename to presto/docker/coordinator/jvm.config
diff --git a/prestosql/docker/coordinator/minio.properties b/presto/docker/coordinator/minio.properties
similarity index 100%
rename from prestosql/docker/coordinator/minio.properties
rename to presto/docker/coordinator/minio.properties
diff --git a/prestosql/docker/coordinator/node.properties b/presto/docker/coordinator/node.properties
similarity index 100%
rename from prestosql/docker/coordinator/node.properties
rename to presto/docker/coordinator/node.properties
diff --git a/prestosql/docker/worker/Dockerfile b/presto/docker/worker/Dockerfile
similarity index 100%
rename from prestosql/docker/worker/Dockerfile
rename to presto/docker/worker/Dockerfile
diff --git a/prestosql/docker/worker/README.md b/presto/docker/worker/README.md
similarity index 100%
rename from prestosql/docker/worker/README.md
rename to presto/docker/worker/README.md
diff --git a/prestosql/docker/worker/config.properties b/presto/docker/worker/config.properties
similarity index 100%
rename from prestosql/docker/worker/config.properties
rename to presto/docker/worker/config.properties
diff --git a/prestosql/docker/worker/jvm.config b/presto/docker/worker/jvm.config
similarity index 100%
rename from prestosql/docker/worker/jvm.config
rename to presto/docker/worker/jvm.config
diff --git a/prestosql/docker/worker/minio.properties b/presto/docker/worker/minio.properties
similarity index 100%
rename from prestosql/docker/worker/minio.properties
rename to presto/docker/worker/minio.properties
diff --git a/prestosql/docker/worker/node.properties b/presto/docker/worker/node.properties
similarity index 100%
rename from prestosql/docker/worker/node.properties
rename to presto/docker/worker/node.properties
diff --git a/prestosql/presto-deployment-master.yaml b/presto/presto-deployment-master.yaml
similarity index 89%
rename from prestosql/presto-deployment-master.yaml
rename to presto/presto-deployment-master.yaml
index 05d1f56..8e7a442 100755
--- a/prestosql/presto-deployment-master.yaml
+++ b/presto/presto-deployment-master.yaml
@@ -14,7 +14,7 @@
         app: presto
     spec:
       containers:
-      - image: bigtop/prestosql-coordinator:latest
+      - image: bigtop/presto-coordinator:latest
         name: presto-w
         ports:
         - containerPort: 8080
diff --git a/prestosql/presto-deployment-worker.yaml b/presto/presto-deployment-worker.yaml
similarity index 90%
rename from prestosql/presto-deployment-worker.yaml
rename to presto/presto-deployment-worker.yaml
index d6abb38..c49819c 100755
--- a/prestosql/presto-deployment-worker.yaml
+++ b/presto/presto-deployment-worker.yaml
@@ -14,7 +14,7 @@
         app: presto-worker
     spec:
       containers:
-      - image: bigtop/prestosql-worker:latest
+      - image: bigtop/presto-worker:latest
         name: presto-w
         resources:
           requests:
diff --git a/prestosql/presto-deployment.yaml b/presto/presto-deployment.yaml
similarity index 88%
rename from prestosql/presto-deployment.yaml
rename to presto/presto-deployment.yaml
index 905f683..74570a1 100644
--- a/prestosql/presto-deployment.yaml
+++ b/presto/presto-deployment.yaml
@@ -14,7 +14,7 @@
         io.kompose.service: presto
     spec:
       containers:
-      - image: bigtop/bigtop-prestosql-worker:latest
+      - image: bigtop/presto-worker:latest
         name: presto-w
         ports:
         - containerPort: 8080
diff --git a/prestosql/service.yaml b/presto/service.yaml
similarity index 100%
rename from prestosql/service.yaml
rename to presto/service.yaml
diff --git a/prestosql/docker/Makefile b/prestosql/docker/Makefile
deleted file mode 100644
index aa5c1ac..0000000
--- a/prestosql/docker/Makefile
+++ /dev/null
@@ -1,8 +0,0 @@
-PRESTO_VERSION := latest
-
-.PHONY: build 
-
-build:
-	docker build --squash --build-arg PRESTO_IMAGE=prestosql/presto:${PRESTO_VERSION} -t bigtop/prestosql-coordinator:${PRESTO_VERSION} coordinator
-	docker build --squash --build-arg PRESTO_IMAGE=prestosql/presto:${PRESTO_VERSION} -t bigtop/prestosql-worker:${PRESTO_VERSION} worker
-
diff --git a/prestosql/docker/README.md b/prestosql/docker/README.md
deleted file mode 100644
index 71bd24c..0000000
--- a/prestosql/docker/README.md
+++ /dev/null
@@ -1,6 +0,0 @@
-Buil Docker images for PrestoSQL 
-
-```
-$ make build
-
-```
diff --git a/prestosql/docker/coordinator/README.md b/prestosql/docker/coordinator/README.md
deleted file mode 100755
index 6a6686f..0000000
--- a/prestosql/docker/coordinator/README.md
+++ /dev/null
@@ -1,7 +0,0 @@
-# Use squash !
-
-Building this image, make sure you use squash so you can gut the 12 GB file :) 
-
-docker build --squash -t bigtop/prestosql-coordinator:320 --build-arg PRESTO_IMAGE=prestosql/presto:320 .
-
-