diff --git a/Readme.md b/Readme.md
index 7f6f77b3..d1f44318 100644
--- a/Readme.md
+++ b/Readme.md
@@ -1 +1 @@
-# Sulix base packages
\ No newline at end of file
+# Sulix main packages
diff --git a/buildall.sh b/buildall.sh
index fa1071d4..b7da02f2 100644
--- a/buildall.sh
+++ b/buildall.sh
@@ -1,18 +1,18 @@
 #!/bin/bash
 set -e
-find -type f | grep ympbuild | while read line ; do
+find -type f | grep ympbuild | sort -V | while read line ; do
     echo -e "\033[33;1m=>> BINARY BUILD START:\033[;0m $line"
-    if ! ls $(dirname $line)/*$(uname -m).ymp ; then
+    name=$(basename $(dirname $line))
+    if ! ls ./output/${name}_*$(uname -m).ymp ; then
         ymp build $(dirname $line) --verbose --no-source --ignore-dependency --allow-oem
     fi
     echo -e "\033[33;1m<<= BINARY BUILD DONE:\033[;0m $line"
 done
-[[ -d output ]] && rm -rf output
 mkdir -p output
 echo "<h1><b>YMP index:</b></h1><br>" > output/index.html
-find -type f | grep "$(uname -m).ymp$" | sort -V | while read line ; do
+find -type f  | grep -v "output"| grep "$(uname -m).ymp$" | sort -V | while read line ; do
     mv $line output
     echo "* <a href=\"$(basename $line)\">$(basename $line)</a><br>" >> output/index.html
 done
-ymp index output --allow-oem
+ymp index output --allow-oem --verbose
 echo "* <a href=\"ymp-index.yaml\">ymp-index.yaml</a><br>" >> output/index.html
diff --git a/base-files/ympbuild b/system/base/base-files/ympbuild
similarity index 100%
rename from base-files/ympbuild
rename to system/base/base-files/ympbuild
diff --git a/bash/ympbuild b/system/base/bash/ympbuild
similarity index 100%
rename from bash/ympbuild
rename to system/base/bash/ympbuild
diff --git a/busybox/busybox.sysconf b/system/base/busybox/busybox.sysconf
similarity index 100%
rename from busybox/busybox.sysconf
rename to system/base/busybox/busybox.sysconf
diff --git a/busybox/ympbuild b/system/base/busybox/ympbuild
similarity index 100%
rename from busybox/ympbuild
rename to system/base/busybox/ympbuild
diff --git a/dash/ympbuild b/system/base/dash/ympbuild
similarity index 100%
rename from dash/ympbuild
rename to system/base/dash/ympbuild
diff --git a/glibc/glibc.sysconf b/system/base/glibc/glibc.sysconf
similarity index 100%
rename from glibc/glibc.sysconf
rename to system/base/glibc/glibc.sysconf
diff --git a/glibc/ld.so.conf b/system/base/glibc/ld.so.conf
similarity index 100%
rename from glibc/ld.so.conf
rename to system/base/glibc/ld.so.conf
diff --git a/glibc/reenable_DT_HASH.patch b/system/base/glibc/reenable_DT_HASH.patch
similarity index 100%
rename from glibc/reenable_DT_HASH.patch
rename to system/base/glibc/reenable_DT_HASH.patch
diff --git a/glibc/usr-support.conf b/system/base/glibc/usr-support.conf
similarity index 100%
rename from glibc/usr-support.conf
rename to system/base/glibc/usr-support.conf
diff --git a/glibc/x86_64-linux-gnu.conf b/system/base/glibc/x86_64-linux-gnu.conf
similarity index 100%
rename from glibc/x86_64-linux-gnu.conf
rename to system/base/glibc/x86_64-linux-gnu.conf
diff --git a/glibc/ympbuild b/system/base/glibc/ympbuild
similarity index 100%
rename from glibc/ympbuild
rename to system/base/glibc/ympbuild
diff --git a/libffi/ympbuild b/system/base/libffi/ympbuild
similarity index 100%
rename from libffi/ympbuild
rename to system/base/libffi/ympbuild
diff --git a/libtasn/ympbuild b/system/base/libtasn/ympbuild
similarity index 100%
rename from libtasn/ympbuild
rename to system/base/libtasn/ympbuild
diff --git a/make-ca/make-ca.sysconf b/system/base/make-ca/make-ca.sysconf
similarity index 100%
rename from make-ca/make-ca.sysconf
rename to system/base/make-ca/make-ca.sysconf
diff --git a/make-ca/ympbuild b/system/base/make-ca/ympbuild
similarity index 100%
rename from make-ca/ympbuild
rename to system/base/make-ca/ympbuild
diff --git a/ncurses/ympbuild b/system/base/ncurses/ympbuild
similarity index 100%
rename from ncurses/ympbuild
rename to system/base/ncurses/ympbuild
diff --git a/readline/inputrc b/system/base/readline/inputrc
similarity index 100%
rename from readline/inputrc
rename to system/base/readline/inputrc
diff --git a/readline/ympbuild b/system/base/readline/ympbuild
similarity index 100%
rename from readline/ympbuild
rename to system/base/readline/ympbuild
diff --git a/zlib/ympbuild b/system/base/zlib/ympbuild
similarity index 100%
rename from zlib/ympbuild
rename to system/base/zlib/ympbuild
diff --git a/update.sh b/update.sh
index f1c2b867..4def00f5 100644
--- a/update.sh
+++ b/update.sh
@@ -1,15 +1,16 @@
 #!/bin/bash
-find -type f | grep ympbuild | while read line ; do
+set -e
+find -type f | grep ympbuild | sort -V | while read line ; do
     echo -e "\033[33;1m=>> SOURCE BUILD START:\033[;0m $line"
-    if ! ls $(dirname $line)/*.source.ymp ; then
+    name=$(basename $(dirname $line))
+    if ! ls ./output/${name}_*source.ymp 2>/dev/null ; then
         ymp build $(dirname $line) --verbose --no-binary --ignore-dependency --allow-oem
         echo -e "\033[33;1m<<= SOURCE BUILD DONE:\033[;0m $line"
     fi
 done
-[[ -d output ]] && rm -rf output
 mkdir -p output
 echo "<h1><b>YMP index:</b></h1><br>" > output/index.html
-find -type f | grep "source.ymp$" | sort -V | while read line ; do
+find -type f  | grep -v "output"| grep "source.ymp$" | sort -V | while read line ; do
     mv $line output
     echo "* <a href=\"$(basename $line)\">$(basename $line)</a><br>" >> output/index.html
 done