diff --git a/demo/helloworld/Makefile b/demo/helloworld/Makefile
index ff618cc..ab031cb 100644
--- a/demo/helloworld/Makefile
+++ b/demo/helloworld/Makefile
@@ -10,7 +10,6 @@ ABI = -mabi=ilp32 -march=rv32imc
 VERILATOR = verilator
 TESTDIR = ${PWD}
 BUILD_DIR = ${TESTDIR}/build
-SWERV_CONFIG = ${TESTDIR}/swerv.config
 RV_DESIGN = ${RV_ROOT}/design
 RV_SOC = ${RV_ROOT}/soc
 
@@ -43,9 +42,8 @@ all: clean verilator
 clean:
 	rm -rf build obj_dir
 
-# If define files do not exist, then run swerv.config.
 ${BUILD_DIR}/defines.h :
-	BUILD_PATH=${BUILD_DIR} ${SWERV_CONFIG} -target=default -set iccm_enable
+	BUILD_PATH=${BUILD_DIR} PERLLIB=${RV_SOC} ${RV_SOC}/swerv.config -target=default -set iccm_enable
 
 ##################### Verilog Builds #####################################
 
diff --git a/demo/helloworld/JSON.pm b/soc/JSON.pm
similarity index 100%
rename from demo/helloworld/JSON.pm
rename to soc/JSON.pm
diff --git a/soc/Makefile b/soc/Makefile
new file mode 100644
index 0000000..e69de29
diff --git a/demo/helloworld/swerv.config b/soc/swerv.config
similarity index 100%
rename from demo/helloworld/swerv.config
rename to soc/swerv.config