diff --git a/lunar_pole_exploration_rover/docker/Dockerfile b/lunar_pole_exploration_rover/Dockerfile
similarity index 100%
rename from lunar_pole_exploration_rover/docker/Dockerfile
rename to lunar_pole_exploration_rover/Dockerfile
diff --git a/lunar_pole_exploration_rover/README.md b/lunar_pole_exploration_rover/README.md
index 14c4271e..cfc31a97 100644
--- a/lunar_pole_exploration_rover/README.md
+++ b/lunar_pole_exploration_rover/README.md
@@ -48,10 +48,9 @@ This package and associated plugins and models were developped by [Robin Baran](
 
 ## Running the demo <a name="running_demo"></a>
 ### Building the docker <a name="building_docker"></a>
-To build the docker image, go to the docker folder and run:
+To build the docker image, go to the main folder of the lunar_pole_rover package and run:
 
 ```bash
-cd docker
 ./build.sh
 ```
 
diff --git a/lunar_pole_exploration_rover/docker/build.sh b/lunar_pole_exploration_rover/build.sh
similarity index 100%
rename from lunar_pole_exploration_rover/docker/build.sh
rename to lunar_pole_exploration_rover/build.sh
diff --git a/lunar_pole_exploration_rover/docker/demo-pkgs.txt b/lunar_pole_exploration_rover/demo-pkgs.txt
similarity index 100%
rename from lunar_pole_exploration_rover/docker/demo-pkgs.txt
rename to lunar_pole_exploration_rover/demo-pkgs.txt
diff --git a/lunar_pole_exploration_rover/docker/demo_manual_pkgs.repos b/lunar_pole_exploration_rover/demo_manual_pkgs.repos
similarity index 100%
rename from lunar_pole_exploration_rover/docker/demo_manual_pkgs.repos
rename to lunar_pole_exploration_rover/demo_manual_pkgs.repos
diff --git a/lunar_pole_exploration_rover/docker/entrypoint.sh b/lunar_pole_exploration_rover/entrypoint.sh
similarity index 100%
rename from lunar_pole_exploration_rover/docker/entrypoint.sh
rename to lunar_pole_exploration_rover/entrypoint.sh
diff --git a/lunar_pole_exploration_rover/docker/excluded-pkgs.txt b/lunar_pole_exploration_rover/excluded-pkgs.txt
similarity index 100%
rename from lunar_pole_exploration_rover/docker/excluded-pkgs.txt
rename to lunar_pole_exploration_rover/excluded-pkgs.txt
diff --git a/lunar_pole_exploration_rover/docker/run.sh b/lunar_pole_exploration_rover/run.sh
similarity index 100%
rename from lunar_pole_exploration_rover/docker/run.sh
rename to lunar_pole_exploration_rover/run.sh
diff --git a/lunar_pole_exploration_rover/docker/run_gpu.sh b/lunar_pole_exploration_rover/run_gpu.sh
similarity index 100%
rename from lunar_pole_exploration_rover/docker/run_gpu.sh
rename to lunar_pole_exploration_rover/run_gpu.sh