diff --git a/README b/README
index 1fe9c31..6db471b 100644
--- a/README
+++ b/README
@@ -113,6 +113,9 @@ $Id$
         /CLFS2/master.sh
               /clfs2.xsl
 
+        /CLFS3/master.sh
+              /clfs3.xsl
+
         /HLFS/master.sh
              /hlfs.xsl
 
@@ -121,14 +124,12 @@ $Id$
 
         /common/common_functions
                /makefile_functions
-               /func_check_versions.sh
-               /func_validate_configs.sh
                /packages.xsl
                /urls.xsl
                /create-sbu_du-report.sh
-               /func_compare.sh
                /progress_bar.sh
                /blfs-tool-deps/9xx-*
+               /libs/*
 
         /contrib/jhalfs-paco.patch
 
diff --git a/blfs-tool b/blfs-tool
index 6e27f28..eeeceb5 100755
--- a/blfs-tool
+++ b/blfs-tool
@@ -73,12 +73,12 @@ source configuration
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
-source $COMMON_DIR/func_check_version.sh
+source $COMMON_DIR/libs/func_check_version.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
-source $COMMON_DIR/func_validate_configs.sh
+source $COMMON_DIR/libs/func_validate_configs.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
 [[ $VERBOSITY > 0 ]] && echo "${SD_BORDER}${nl_}"
diff --git a/jhalfs b/jhalfs
index 224e70e..562ac6a 100755
--- a/jhalfs
+++ b/jhalfs
@@ -255,17 +255,17 @@ source $MODULE
 
 #*******************************************************************#
 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_check_version.sh>..."
-source $COMMON_DIR/func_check_version.sh
+source $COMMON_DIR/libs/func_check_version.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <func_validate_configs.sh>..."
-source $COMMON_DIR/func_validate_configs.sh
+source $COMMON_DIR/libs/func_validate_configs.sh
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
 [[ $VERBOSITY > 0 ]] && echo -n "Loading function <custom_pkgs>..."
-source $COMMON_DIR/custom_pkgs
+source $COMMON_DIR/libs/custom_pkgs
 [[ $? > 0 ]] && echo " function module did not load.." && exit 2
 [[ $VERBOSITY > 0 ]] && echo "OK"
 
@@ -296,8 +296,8 @@ echo "${nl_}${SD_BORDER}${nl_}"
 # compare module
 if [[ "$COMPARE" = "y" ]]; then
   [[ $VERBOSITY > 0 ]] && echo -n "Loading compare module..."
-  source $COMMON_DIR/func_compare.sh
-  [[ $? > 0 ]] && echo "$COMMON_DIR/func_compare.sh did not load.." && exit
+  source $COMMON_DIR/libs/func_compare.sh
+  [[ $? > 0 ]] && echo "$COMMON_DIR/libs/func_compare.sh did not load.." && exit
   [[ $VERBOSITY > 0 ]] && echo "OK"
 fi
 #