diff --git a/scripts/core_scripts/README.md b/scripts/core_scripts/README.md
new file mode 100644
index 0000000..daa5515
--- /dev/null
+++ b/scripts/core_scripts/README.md
@@ -0,0 +1,3 @@
+# What is this?
+
+Core scripts are doing the actual work, scripts under ../scripts are the ones that should be used.
\ No newline at end of file
diff --git a/scripts/AAG Version/magic-drc.sh b/scripts/core_scripts/magic-drc.sh
similarity index 92%
rename from scripts/AAG Version/magic-drc.sh
rename to scripts/core_scripts/magic-drc.sh
index a14dd77..d2d6549 100644
--- a/scripts/AAG Version/magic-drc.sh
+++ b/scripts/core_scripts/magic-drc.sh
@@ -20,12 +20,9 @@
 export PDK_ROOT=$3
 export TARGET_TYPE=$4
 export PDK=$5
-export OUT_DIR=${6:-$TARGET_DIR/results/}
+export OUT_DIR=$6
+export TCL_CALL_PATH=${7:-$(pwd)}
 
-if ! [[ -d "$OUT_DIR" ]]
-then
-    mkdir $OUT_DIR
-fi
 echo "Running Magic..."
 export MAGIC_MAGICRC=$PDK_ROOT/$PDK/libs.tech/magic/sky130A.magicrc
 
@@ -33,7 +30,7 @@
     -noconsole \
     -dnull \
     -rcfile $MAGIC_MAGICRC \
-    $(pwd)/magic-drc.tcl \
+    $TCL_CALL_PATH/magic-drc.tcl \
     </dev/null \
     |& tee $OUT_DIR/magic_drc.log
 
diff --git a/scripts/AAG Version/magic-drc.tcl b/scripts/core_scripts/magic-drc.tcl
similarity index 100%
rename from scripts/AAG Version/magic-drc.tcl
rename to scripts/core_scripts/magic-drc.tcl
diff --git a/scripts/AAG Version/drc-def-sky130A.sh b/scripts/drc-def-sky130A.sh
similarity index 92%
rename from scripts/AAG Version/drc-def-sky130A.sh
rename to scripts/drc-def-sky130A.sh
index de94235..f373ffd 100644
--- a/scripts/AAG Version/drc-def-sky130A.sh
+++ b/scripts/drc-def-sky130A.sh
@@ -19,9 +19,10 @@
 export DESIGN_NAME=$2
 export PDK_ROOT=$3
 export OUT_DIR=${4:-$TARGET_DIR/results/}
+export TCL_CALL_PATH=$(pwd)/core_scripts
 
 if ! [[ -d "$OUT_DIR" ]]
 then
     mkdir $OUT_DIR
 fi
-bash ./magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "mag" "sky130A" $OUT_DIR
+bash ./magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "mag" "sky130A" $OUT_DIR $TCL_CALL_PATH
diff --git a/scripts/AAG Version/drc-gds-sky130A.sh b/scripts/drc-gds-sky130A.sh
similarity index 85%
rename from scripts/AAG Version/drc-gds-sky130A.sh
rename to scripts/drc-gds-sky130A.sh
index 0a86528..aff4cec 100644
--- a/scripts/AAG Version/drc-gds-sky130A.sh
+++ b/scripts/drc-gds-sky130A.sh
@@ -19,9 +19,11 @@
 export DESIGN_NAME=$2
 export PDK_ROOT=$3
 export OUT_DIR=${4:-$TARGET_DIR/results/}
+export TCL_CALL_PATH=$(pwd)/core_scripts
 
 if ! [[ -d "$OUT_DIR" ]]
 then
     mkdir $OUT_DIR
 fi
-bash ./magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "gds" "sky130A" $OUT_DIR
+
+bash ./core_scripts/magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "gds" "sky130A" $OUT_DIR $TCL_CALL_PATH
diff --git a/scripts/AAG Version/drc-mag-sky130A.sh b/scripts/drc-mag-sky130A.sh
similarity index 92%
rename from scripts/AAG Version/drc-mag-sky130A.sh
rename to scripts/drc-mag-sky130A.sh
index 2abc8bc..b63ad08 100644
--- a/scripts/AAG Version/drc-mag-sky130A.sh
+++ b/scripts/drc-mag-sky130A.sh
@@ -19,9 +19,10 @@
 export DESIGN_NAME=$2
 export PDK_ROOT=$3
 export OUT_DIR=${4:-$TARGET_DIR/results/}
+export TCL_CALL_PATH=$(pwd)/core_scripts
 
 if ! [[ -d "$OUT_DIR" ]]
 then
     mkdir $OUT_DIR
 fi
-bash ./magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "mag" "sky130A" $OUT_DIR
+bash ./magic-drc.sh $TARGET_DIR $DESIGN_NAME $PDK_ROOT "mag" "sky130A" $OUT_DIR $TCL_CALL_PATH
diff --git a/scripts/README.md b/scripts/dumped_scripts/README.md
similarity index 100%
rename from scripts/README.md
rename to scripts/dumped_scripts/README.md
diff --git a/scripts/addmpwseal.tcl b/scripts/dumped_scripts/addmpwseal.tcl
similarity index 100%
rename from scripts/addmpwseal.tcl
rename to scripts/dumped_scripts/addmpwseal.tcl
diff --git a/scripts/create-project.sh b/scripts/dumped_scripts/create-project.sh
similarity index 100%
rename from scripts/create-project.sh
rename to scripts/dumped_scripts/create-project.sh
diff --git a/scripts/dot.magicrc b/scripts/dumped_scripts/dot.magicrc
similarity index 100%
rename from scripts/dot.magicrc
rename to scripts/dumped_scripts/dot.magicrc
diff --git a/scripts/drc-mag.sh b/scripts/dumped_scripts/drc-mag.sh
similarity index 100%
rename from scripts/drc-mag.sh
rename to scripts/dumped_scripts/drc-mag.sh
diff --git a/scripts/drc-maglef.sh b/scripts/dumped_scripts/drc-maglef.sh
similarity index 100%
rename from scripts/drc-maglef.sh
rename to scripts/dumped_scripts/drc-maglef.sh
diff --git a/scripts/drc.sh b/scripts/dumped_scripts/drc.sh
similarity index 100%
rename from scripts/drc.sh
rename to scripts/dumped_scripts/drc.sh
diff --git a/scripts/edit.tcl b/scripts/dumped_scripts/edit.tcl
similarity index 100%
rename from scripts/edit.tcl
rename to scripts/dumped_scripts/edit.tcl
diff --git a/scripts/ext-gds.sh b/scripts/dumped_scripts/ext-gds.sh
similarity index 100%
rename from scripts/ext-gds.sh
rename to scripts/dumped_scripts/ext-gds.sh
diff --git a/scripts/ext-mag.sh b/scripts/dumped_scripts/ext-mag.sh
similarity index 100%
rename from scripts/ext-mag.sh
rename to scripts/dumped_scripts/ext-mag.sh
diff --git a/scripts/ext.sh b/scripts/dumped_scripts/ext.sh
similarity index 100%
rename from scripts/ext.sh
rename to scripts/dumped_scripts/ext.sh
diff --git a/scripts/extract.tcl b/scripts/dumped_scripts/extract.tcl
similarity index 100%
rename from scripts/extract.tcl
rename to scripts/dumped_scripts/extract.tcl
diff --git a/scripts/lvs.sh b/scripts/dumped_scripts/lvs.sh
similarity index 100%
rename from scripts/lvs.sh
rename to scripts/dumped_scripts/lvs.sh
diff --git a/scripts/mag2gds.tcl b/scripts/dumped_scripts/mag2gds.tcl
similarity index 100%
rename from scripts/mag2gds.tcl
rename to scripts/dumped_scripts/mag2gds.tcl
diff --git a/scripts/magic_drc.tcl b/scripts/dumped_scripts/magic_drc.tcl
similarity index 100%
rename from scripts/magic_drc.tcl
rename to scripts/dumped_scripts/magic_drc.tcl
diff --git a/scripts/pfg.sh b/scripts/dumped_scripts/pfg.sh
similarity index 100%
rename from scripts/pfg.sh
rename to scripts/dumped_scripts/pfg.sh
diff --git a/scripts/run_openram_tc_1kb.sh b/scripts/dumped_scripts/run_openram_tc_1kb.sh
similarity index 100%
rename from scripts/run_openram_tc_1kb.sh
rename to scripts/dumped_scripts/run_openram_tc_1kb.sh
diff --git a/scripts/setup.tcl b/scripts/dumped_scripts/setup.tcl
similarity index 100%
rename from scripts/setup.tcl
rename to scripts/dumped_scripts/setup.tcl
diff --git a/scripts/wrap.tcl b/scripts/dumped_scripts/wrap.tcl
similarity index 100%
rename from scripts/wrap.tcl
rename to scripts/dumped_scripts/wrap.tcl
diff --git a/scripts/wrap2.tcl b/scripts/dumped_scripts/wrap2.tcl
similarity index 100%
rename from scripts/wrap2.tcl
rename to scripts/dumped_scripts/wrap2.tcl