diff --git a/scripts/windows/coco-dev-setup/batch/get_category.bat b/scripts/windows/coco-dev-setup/batch/get_category.bat
deleted file mode 100755
index c1d142030..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_category.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-for /f "delims=" %%a in ('utilities\\get_category.exe %*') do (
-	%%a
-)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_config.bat b/scripts/windows/coco-dev-setup/batch/get_config.bat
deleted file mode 100755
index be18759c3..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_config.bat
+++ /dev/null
@@ -1 +0,0 @@
-for /f "delims=" %%a in ('utilities\\get_var.exe config\\config.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_download.bat b/scripts/windows/coco-dev-setup/batch/get_download.bat
deleted file mode 100755
index 42b483593..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_download.bat
+++ /dev/null
@@ -1 +0,0 @@
-for /f "delims=" %%a in ('utilities\\get_var.exe config\\downloads.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_text.bat b/scripts/windows/coco-dev-setup/batch/get_text.bat
deleted file mode 100755
index ca6f938de..000000000
--- a/scripts/windows/coco-dev-setup/batch/get_text.bat
+++ /dev/null
@@ -1,3 +0,0 @@
-for /f "delims=" %%a in ('utilities\\get_var.exe localisation\\%1.coco %2') do (
-	set "%%a"
-)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_header.bat b/scripts/windows/coco-dev-setup/batch/print_header.bat
deleted file mode 100755
index 5a8c68062..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_header.bat
+++ /dev/null
@@ -1 +0,0 @@
-print_file config/header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_info.bat b/scripts/windows/coco-dev-setup/batch/print_info.bat
deleted file mode 100755
index fa3894c6f..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_info.bat
+++ /dev/null
@@ -1 +0,0 @@
-print_file config/info.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_license.bat b/scripts/windows/coco-dev-setup/batch/print_license.bat
deleted file mode 100755
index 4f94de71c..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_license.bat
+++ /dev/null
@@ -1 +0,0 @@
-print_file config/license.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_tips.bat b/scripts/windows/coco-dev-setup/batch/print_tips.bat
deleted file mode 100755
index 90d1ec795..000000000
--- a/scripts/windows/coco-dev-setup/batch/print_tips.bat
+++ /dev/null
@@ -1 +0,0 @@
-print_file config/tips.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/ask_question.bat b/scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/ask_question.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/ask_question.bat
diff --git a/scripts/windows/coco-dev-setup/batch/download_and_install_applications.bat b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
similarity index 60%
rename from scripts/windows/coco-dev-setup/batch/download_and_install_applications.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
index 2dd08a7c6..87ab3709f 100755
--- a/scripts/windows/coco-dev-setup/batch/download_and_install_applications.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/download_and_install_applications.bat
@@ -7,7 +7,7 @@ if %system_info_os% == XP (
 	call print_exit
 )
 
-call get_category config\\downloads.coco downloads downloads_count general-general general-%system_info_bit% %system_info_os%-%system_info_bit%
+call get_category ..\\config\\downloads.coco downloads downloads_count general-general general-%system_info_bit% %system_info_os%-%system_info_bit%
 
 ::for /l %%i in (1, 1, %downloads_count%) do (
 ::	echo %downloads[%%i]%
diff --git a/scripts/windows/coco-dev-setup/batch/get_array.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/get_array.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/get_array.bat
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat
new file mode 100755
index 000000000..44384806f
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_category.bat
@@ -0,0 +1,3 @@
+for /f "delims=" %%a in ('..\\utilities\\get_category.exe %*') do (
+	%%a
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
new file mode 100755
index 000000000..8925febdf
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_config.bat
@@ -0,0 +1 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\config\\config.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
new file mode 100755
index 000000000..e72c2cca6
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_download.bat
@@ -0,0 +1 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\config\\downloads.coco %1') do set "%%a"
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/get_language.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
similarity index 91%
rename from scripts/windows/coco-dev-setup/batch/get_language.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
index 7b6c8396a..54223b7c0 100755
--- a/scripts/windows/coco-dev-setup/batch/get_language.bat
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_language.bat
@@ -3,7 +3,7 @@ echo but most feedback is sent and localised by us.
 echo Here is a list of languages:
 call print_dashed_seperator
 
-call get_array localisation\\languages.coco languages language_count
+call get_array ..\\localisation\\languages.coco languages language_count
 for /l %%i in (1,1,%language_count%) do (
 	call get_text !languages[%%i]! "global-native"
 	echo   [%%i] !global_native!
diff --git a/scripts/windows/coco-dev-setup/batch/get_local_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/get_local_text.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/get_local_text.bat
diff --git a/scripts/windows/coco-dev-setup/batch/get_system_information.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/get_system_information.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/get_system_information.bat
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
new file mode 100755
index 000000000..a212b3625
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/get_text.bat
@@ -0,0 +1,3 @@
+for /f "delims=" %%a in ('..\\utilities\\get_var.exe ..\\localisation\\%1.coco %2') do (
+	set "%%a"
+)
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/open_text_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/open_text_file.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/open_text_file.bat
diff --git a/scripts/windows/coco-dev-setup/batch/print_dashed_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/print_dashed_seperator.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/print_dashed_seperator.bat
diff --git a/scripts/windows/coco-dev-setup/batch/print_exit.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/print_exit.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/print_exit.bat
diff --git a/scripts/windows/coco-dev-setup/batch/print_file.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/print_file.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/print_file.bat
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
new file mode 100755
index 000000000..328405e67
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_header.bat
@@ -0,0 +1 @@
+call print_file ..\\config\\header.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
new file mode 100755
index 000000000..7af731410
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_info.bat
@@ -0,0 +1 @@
+print_file ..\\config\\info.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
new file mode 100755
index 000000000..a208ca559
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_license.bat
@@ -0,0 +1 @@
+print_file ..\\config\\license.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/print_seperator.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/print_seperator.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/print_seperator.bat
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
new file mode 100755
index 000000000..c00833574
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/print_tips.bat
@@ -0,0 +1 @@
+print_file ..\\config\\tips.coco
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/scripts/setup.bat b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
new file mode 100755
index 000000000..5350f2bcb
--- /dev/null
+++ b/scripts/windows/coco-dev-setup/batch/scripts/setup.bat
@@ -0,0 +1,29 @@
+@echo off
+setlocal EnableDelayedExpansion
+
+Color 0A
+mode con: cols=78 lines=60
+
+call print_header
+call print_dashed_seperator
+
+call get_config version
+call get_config author
+call get_config copyright
+echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
+echo v%version% authored by %author% and published by %copyright%.
+call print_seperator
+
+echo Before we start the installation, here are some tips:
+call print_tips
+call print_seperator
+
+call sign_license
+
+call get_language
+
+call download_and_install_applications
+
+pause
+
+endlocal
\ No newline at end of file
diff --git a/scripts/windows/coco-dev-setup/batch/sign_license.bat b/scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
similarity index 100%
rename from scripts/windows/coco-dev-setup/batch/sign_license.bat
rename to scripts/windows/coco-dev-setup/batch/scripts/sign_license.bat
diff --git a/scripts/windows/coco-dev-setup/batch/setup.bat b/scripts/windows/coco-dev-setup/batch/setup.bat
index 5350f2bcb..aa57d4523 100755
--- a/scripts/windows/coco-dev-setup/batch/setup.bat
+++ b/scripts/windows/coco-dev-setup/batch/setup.bat
@@ -1,29 +1,2 @@
-@echo off
-setlocal EnableDelayedExpansion
-
-Color 0A
-mode con: cols=78 lines=60
-
-call print_header
-call print_dashed_seperator
-
-call get_config version
-call get_config author
-call get_config copyright
-echo Welcome to the automated Installation of the CodeCombat Dev. Environment!
-echo v%version% authored by %author% and published by %copyright%.
-call print_seperator
-
-echo Before we start the installation, here are some tips:
-call print_tips
-call print_seperator
-
-call sign_license
-
-call get_language
-
-call download_and_install_applications
-
-pause
-
-endlocal
\ No newline at end of file
+cd scripts
+setup.bat
\ No newline at end of file