diff --git a/client-services/wanpad-startup/startup.sh b/client-services/wanpad-startup/startup.sh
index 95dfb39..f584eab 100644
--- a/client-services/wanpad-startup/startup.sh
+++ b/client-services/wanpad-startup/startup.sh
@@ -3,8 +3,10 @@
 # You need to mention the scripts you want to 
 # run at startup here.
 
-. /etc/wanpad/client-services/wanpad-startup-1.sh
-. /etc/wanpad/client-services/wanpad-startup-2.sh
-. /etc/wanpad/client-services/wanpad-startup-3.sh
+DIR="/etc/wanpad/wanpad-startup"
+
+. ${DIR}/wanpad-startup-1.sh
+. ${DIR}/wanpad-startup-2.sh
+. ${DIR}/wanpad-startup-3.sh
 
 
diff --git a/client-services/wanpad-startup/wanpad-startup.service b/client-services/wanpad-startup/wanpad-startup.service
index 753cf44..1d8b077 100644
--- a/client-services/wanpad-startup/wanpad-startup.service
+++ b/client-services/wanpad-startup/wanpad-startup.service
@@ -6,7 +6,7 @@ Description=WANPAD startup service
 [Service]
 Type=simple
 User=root
-ExecStart=/etc/wanpad/client-services/wanpad-startup/startup.sh
+ExecStart=/etc/wanpad/wanpad-startup/startup.sh
 
 [Install]
 WantedBy=multi-user.target