diff --git a/bin/buildForWindows.sh b/bin/buildForWindows.sh
index 7636fecea..818522ad0 100755
--- a/bin/buildForWindows.sh
+++ b/bin/buildForWindows.sh
@@ -7,12 +7,7 @@ fatal() { error "$@"; exit 1; }
 is_cmd() { command -v "$@" >/dev/null 2>&1; }
 
 # Move to the folder where ep-lite is installed
-cd "$(dirname "$0")"
-
-# Was this script started in the bin folder? if yes move out
-if [ -d "../bin" ]; then
-  cd "../"
-fi
+cd "$(dirname "$0")"/..
 
 # Is wget installed?
 is_cmd wget || fatal "Please install wget"
diff --git a/bin/debugRun.sh b/bin/debugRun.sh
index abb27c40b..d9b18aaa2 100755
--- a/bin/debugRun.sh
+++ b/bin/debugRun.sh
@@ -1,12 +1,7 @@
 #!/bin/sh
 
 # Move to the folder where ep-lite is installed
-cd "$(dirname "$0")"
-
-# Was this script started in the bin folder? if yes move out
-if [ -d "../bin" ]; then
-  cd "../"
-fi
+cd "$(dirname "$0")"/..
 
 # Prepare the environment
 bin/installDeps.sh || exit 1
diff --git a/bin/installDeps.sh b/bin/installDeps.sh
index b7105531e..5e0bbb931 100755
--- a/bin/installDeps.sh
+++ b/bin/installDeps.sh
@@ -45,12 +45,7 @@ require_minimal_version() {
 }
 
 # Move to the folder where ep-lite is installed
-cd "$(dirname "$0")"
-
-# Was this script started in the bin folder? if yes move out
-if [ -d "../bin" ]; then
-  cd "../"
-fi
+cd "$(dirname "$0")"/..
 
 # Is node installed?
 # Not checking io.js, default installation creates a symbolic link to node
diff --git a/bin/run.sh b/bin/run.sh
index e2fe8cb23..23bc3b905 100755
--- a/bin/run.sh
+++ b/bin/run.sh
@@ -6,12 +6,7 @@ error() { log "ERROR: $@" >&2; }
 fatal() { error "$@"; exit 1; }
 
 # Move to the folder where ep-lite is installed
-cd "$(dirname "$0")"
-
-# Was this script started in the bin folder? if yes move out
-if [ -d "../bin" ]; then
-  cd "../"
-fi
+cd "$(dirname "$0")"/..
 
 ignoreRoot=0
 for ARG in "$@"
diff --git a/bin/safeRun.sh b/bin/safeRun.sh
index d9ea8d98c..038d9f5ea 100755
--- a/bin/safeRun.sh
+++ b/bin/safeRun.sh
@@ -25,12 +25,7 @@ LAST_EMAIL_SEND=0
 LOG="$1"
 
 # Move to the folder where ep-lite is installed
-cd "$(dirname "$0")"
-
-# Was this script started in the bin folder? if yes move out
-if [ -d "../bin" ]; then
-  cd "../"
-fi
+cd "$(dirname "$0")"/..
 
 # Check if a logfile parameter is set
 [ -n "${LOG}" ] || fatal "Set a logfile as the first parameter"