diff --git a/Dockerfile b/Dockerfile
index 570eacd..1baf0fd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -6,16 +6,19 @@ RUN apt-get install -y fuse
 
 FROM base-deps
 WORKDIR /root
+
+# Prepare mount points
 RUN mkdir audio
 RUN mkdir radio
-RUN mkdir .config && cd .config && mkdir rclone
 
 # Configuration files copy
-COPY rclone.conf .config/rclone/rclone.conf
-COPY rygel.conf .config/rygel.conf
+RUN mkdir .config && cd .config && mkdir rclone
+COPY config/rclone.conf .config/rclone/rclone.conf
+COPY config/rygel.conf .config/rygel.conf
 
 # Runtime script copy
-COPY wrapper.sh wrapper.sh
+COPY bin/wrapper.sh wrapper.sh
 RUN chmod +x wrapper.sh
 
+# Runtime processes
 CMD /root/wrapper.sh