diff --git a/Makefile b/Makefile
index 8a8232f..76c5ba6 100644
--- a/Makefile
+++ b/Makefile
@@ -5,11 +5,11 @@ TARGET_PROJ ?= node
 
 ifeq ($(TARGET_PROJ), node)
 BUILD_DIR := $(PROJECT)/build/node
-CONFIG_FILE := $(PROJECT)/node_config.json
+CONFIG_FILE := $(PROJECT)/config/node.json
 else ifeq ($(TARGET_PROJ), ge)
 XILINX_VITIS_CLASSIC := y
 BUILD_DIR := $(PROJECT)/build/ge
-CONFIG_FILE := $(PROJECT)/ge_config.json
+CONFIG_FILE := $(PROJECT)/config/ge.json
 else
 $(error Unsupported target PROJECT: $(TARGET_PROJ))
 endif
diff --git a/build.bat b/build.bat
index dbc2125..4b32b9b 100644
--- a/build.bat
+++ b/build.bat
@@ -32,6 +32,8 @@ echo Build directory: %work_dir%
 echo Configuration file: %config%
 pause
 
+REM Change working dir to the dir where this script is located
+cd /d "%~dp0"
 
 REM Set up enviroment
 call "%tools_dir%\setenv.bat" "%pltform_ver%"
diff --git a/ge_config.json b/config/ge.json
similarity index 100%
rename from ge_config.json
rename to config/ge.json
diff --git a/node_config.json b/config/node.json
similarity index 100%
rename from node_config.json
rename to config/node.json
diff --git a/scripts b/scripts
index 3dabd24..0910a55 160000
--- a/scripts
+++ b/scripts
@@ -1 +1 @@
-Subproject commit 3dabd24964c43e5c5ac0fc6fa064c590408914fb
+Subproject commit 0910a5562bd4d480a0e3fc236458d11dd8a80423