diff --git a/Dockerfile b/Dockerfile
index 43ca358..398c4ec 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -29,11 +29,9 @@ RUN curl -o /etc/yum.repos.d/security:shibboleth.repo \
 
 # Add starters and installers
 ADD ./container_files /opt
-      
-COPY httpd-shib-foreground /usr/local/bin/
-COPY conf/attribute-map.xml /opt/etc/shibboleth/attribute-map.xml
-COPY conf/inc-md-cert.pem /opt/etc/shibboleth/inc-md-cert.pem
-COPY conf/shibboleth_keygen.sh /opt/bin/shibboleth_keygen.sh
+
+#Script to start service
+RUN ln -s /opt/bin/httpd-shib-foreground  /usr/local/bin  
 
 #Added ssl default conf
 RUN ln -s /opt/etc/httpd/conf.d/ssl.conf /etc/httpd/conf.d/ssl.conf
diff --git a/httpd-shib-foreground b/container_files/bin/httpd-shib-foreground
similarity index 100%
rename from httpd-shib-foreground
rename to container_files/bin/httpd-shib-foreground
diff --git a/conf/shibboleth_keygen.sh b/container_files/bin/shibboleth_keygen.sh
similarity index 100%
rename from conf/shibboleth_keygen.sh
rename to container_files/bin/shibboleth_keygen.sh
diff --git a/conf/attribute-map.xml b/container_files/etc/shibboleth/attribute-map.xml
similarity index 100%
rename from conf/attribute-map.xml
rename to container_files/etc/shibboleth/attribute-map.xml
diff --git a/conf/inc-md-cert.pem b/container_files/etc/shibboleth/inc-md-cert.pem
similarity index 100%
rename from conf/inc-md-cert.pem
rename to container_files/etc/shibboleth/inc-md-cert.pem