diff --git a/master.sh b/master.sh
index 3ad6590..2a977de 100755
--- a/master.sh
+++ b/master.sh
@@ -57,8 +57,8 @@ source $COMMON_DIR/config
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
 [[ $VERBOSITY > 0 ]] && echo -n "Loading optimization config..."
-source $COMMON_DIR/opt_config
-[[ $? > 0 ]] && echo " $COMMON_DIR/opt_config did not load.." && exit
+source optimize/opt_config
+[[ $? > 0 ]] && echo " optimize/opt_config did not load.." && exit
 [[ $VERBOSITY > 0 ]] && echo "OK"
 #
 [[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
@@ -488,7 +488,7 @@ fi
 
 if [[ "$PWD" != "$JHALFSDIR" ]]; then
   cp $COMMON_DIR/makefile-functions $JHALFSDIR/
-  [[ "$OPTIMIZE" != "0" ]] && cp $COMMON_DIR/opt_override $JHALFSDIR/
+  [[ "$OPTIMIZE" != "0" ]] && cp optimize/opt_override $JHALFSDIR/
   if [[ "$COMPARE" != "0" ]] ; then
     mkdir -p $JHALFSDIR/extras
     cp extras/* $JHALFSDIR/extras
diff --git a/common/opt_config b/optimize/opt_config
similarity index 100%
rename from common/opt_config
rename to optimize/opt_config
diff --git a/common/opt_config.d/defOpt b/optimize/opt_config.d/defOpt
similarity index 100%
rename from common/opt_config.d/defOpt
rename to optimize/opt_config.d/defOpt
diff --git a/common/opt_config.d/defOpt_fPIC b/optimize/opt_config.d/defOpt_fPIC
similarity index 100%
rename from common/opt_config.d/defOpt_fPIC
rename to optimize/opt_config.d/defOpt_fPIC
diff --git a/common/opt_config.d/noOpt b/optimize/opt_config.d/noOpt
similarity index 100%
rename from common/opt_config.d/noOpt
rename to optimize/opt_config.d/noOpt
diff --git a/common/opt_config.d/noSymbols b/optimize/opt_config.d/noSymbols
similarity index 100%
rename from common/opt_config.d/noSymbols
rename to optimize/opt_config.d/noSymbols
diff --git a/common/opt_override b/optimize/opt_override
similarity index 100%
rename from common/opt_override
rename to optimize/opt_override