diff --git a/assemble/.calculate_directory b/assemble/.calculate_directory
new file mode 100644
index 0000000..55d774b
--- /dev/null
+++ b/assemble/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_name==calculate-install
diff --git a/assemble/prepare/.calculate_directory b/assemble/prepare/.calculate_directory
new file mode 100644
index 0000000..527acc4
--- /dev/null
+++ b/assemble/prepare/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_assemble_prepare_action==up
diff --git a/assemble/prepare/etc/etc-update.conf b/assemble/prepare/etc/etc-update.conf
new file mode 100644
index 0000000..6bffe0f
--- /dev/null
+++ b/assemble/prepare/etc/etc-update.conf
@@ -0,0 +1,4 @@
+# Calculate format=procmail
+# arguments used whenever mv is called
+mv_opts=""
+
diff --git a/assemble/prepare/etc/make.conf b/assemble/prepare/etc/make.conf
new file mode 100644
index 0000000..90ef616
--- /dev/null
+++ b/assemble/prepare/etc/make.conf
@@ -0,0 +1,6 @@
+# Calculate
+ACCEPT_LICENSE="*"
+source /var/lib/layman/make.conf
+MAKEOPTS="#-os_install_makeopts-#"
+EMERGE_DEFAULT_OPTS="--jobs=4"
+
diff --git a/builder/clean/.calculate_directory b/builder/clean/.calculate_directory
new file mode 100644
index 0000000..b114747
--- /dev/null
+++ b/builder/clean/.calculate_directory
@@ -0,0 +1 @@
+# Calculate append=skip cl_builder_squash_action==up
diff --git a/builder/squash/clean/calculate.tmp/.calculate_directory b/builder/clean/calculate.tmp/.calculate_directory
similarity index 100%
rename from builder/squash/clean/calculate.tmp/.calculate_directory
rename to builder/clean/calculate.tmp/.calculate_directory
diff --git a/builder/squash/clean/distfiles/.calculate_directory b/builder/clean/distfiles/.calculate_directory
similarity index 100%
rename from builder/squash/clean/distfiles/.calculate_directory
rename to builder/clean/distfiles/.calculate_directory
diff --git a/builder/squash/clean/elog/.calculate_directory b/builder/clean/elog/.calculate_directory
similarity index 100%
rename from builder/squash/clean/elog/.calculate_directory
rename to builder/clean/elog/.calculate_directory
diff --git a/builder/squash/clean/etc/resolv.conf b/builder/clean/etc/resolv.conf
similarity index 100%
rename from builder/squash/clean/etc/resolv.conf
rename to builder/clean/etc/resolv.conf
diff --git a/builder/squash/clean/log.calculate/.calculate_directory b/builder/clean/log.calculate/.calculate_directory
similarity index 100%
rename from builder/squash/clean/log.calculate/.calculate_directory
rename to builder/clean/log.calculate/.calculate_directory
diff --git a/builder/squash/clean/log.clamav/.calculate_directory b/builder/clean/log.clamav/.calculate_directory
similarity index 100%
rename from builder/squash/clean/log.clamav/.calculate_directory
rename to builder/clean/log.clamav/.calculate_directory
diff --git a/builder/squash/clean/news/.calculate_directory b/builder/clean/news/.calculate_directory
similarity index 100%
rename from builder/squash/clean/news/.calculate_directory
rename to builder/clean/news/.calculate_directory
diff --git a/builder/squash/clean/root/.bash_history b/builder/clean/root/.bash_history
similarity index 100%
rename from builder/squash/clean/root/.bash_history
rename to builder/clean/root/.bash_history
diff --git a/builder/squash/clean/root/.subversion/.calculate_directory b/builder/clean/root/.subversion/.calculate_directory
similarity index 100%
rename from builder/squash/clean/root/.subversion/.calculate_directory
rename to builder/clean/root/.subversion/.calculate_directory
diff --git a/builder/squash/clean/root/.viminfo b/builder/clean/root/.viminfo
similarity index 100%
rename from builder/squash/clean/root/.viminfo
rename to builder/clean/root/.viminfo
diff --git a/builder/squash/clean/tmp.portage/.calculate_directory b/builder/clean/tmp.portage/.calculate_directory
similarity index 100%
rename from builder/squash/clean/tmp.portage/.calculate_directory
rename to builder/clean/tmp.portage/.calculate_directory
diff --git a/builder/squash/clean/tmp/.calculate_directory b/builder/clean/tmp/.calculate_directory
similarity index 100%
rename from builder/squash/clean/tmp/.calculate_directory
rename to builder/clean/tmp/.calculate_directory
diff --git a/builder/squash/clean/var/.locks b/builder/clean/var/.locks
similarity index 100%
rename from builder/squash/clean/var/.locks
rename to builder/clean/var/.locks
diff --git a/builder/squash/clean/var/.svn-src b/builder/clean/var/.svn-src
similarity index 100%
rename from builder/squash/clean/var/.svn-src
rename to builder/clean/var/.svn-src
diff --git a/builder/squash/clean/var/log/emerge-fetch.log b/builder/clean/var/log/emerge-fetch.log
similarity index 100%
rename from builder/squash/clean/var/log/emerge-fetch.log
rename to builder/clean/var/log/emerge-fetch.log
diff --git a/builder/squash/clean/var/log/emerge.log b/builder/clean/var/log/emerge.log
similarity index 100%
rename from builder/squash/clean/var/log/emerge.log
rename to builder/clean/var/log/emerge.log
diff --git a/builder/squash/clean/var/log/genkernel.log b/builder/clean/var/log/genkernel.log
similarity index 100%
rename from builder/squash/clean/var/log/genkernel.log
rename to builder/clean/var/log/genkernel.log
diff --git a/builder/squash/clean/var/log/lastlog b/builder/clean/var/log/lastlog
similarity index 100%
rename from builder/squash/clean/var/log/lastlog
rename to builder/clean/var/log/lastlog
diff --git a/builder/squash/clean/var/log/prelink.log b/builder/clean/var/log/prelink.log
similarity index 100%
rename from builder/squash/clean/var/log/prelink.log
rename to builder/clean/var/log/prelink.log
diff --git a/builder/squash/clean/var/log/wtmp b/builder/clean/var/log/wtmp
similarity index 100%
rename from builder/squash/clean/var/log/wtmp
rename to builder/clean/var/log/wtmp
diff --git a/builder/squash/clean/.calculate_directory b/builder/squash/clean/.calculate_directory
deleted file mode 100644
index 720d52e..0000000
--- a/builder/squash/clean/.calculate_directory
+++ /dev/null
@@ -1 +0,0 @@
-# Calculate append=skip
diff --git a/builder/squash/etc/etc-update.conf b/builder/squash/etc/etc-update.conf
new file mode 100644
index 0000000..d688688
--- /dev/null
+++ b/builder/squash/etc/etc-update.conf
@@ -0,0 +1,4 @@
+# Calculate format=procmail
+# arguments used whenever mv is called
+mv_opts="-i"
+
diff --git a/builder/squash/portage/.calculate_directory b/builder/squash/portage/.calculate_directory
index c20e8db..ec47480 100644
--- a/builder/squash/portage/.calculate_directory
+++ b/builder/squash/portage/.calculate_directory
@@ -1 +1 @@
-# Calculate os_builder_linux_system!= path=/var/lib
+# Calculate os_builder_linux_system!=
diff --git a/builder/squash/portage/make.conf b/builder/squash/portage/make.conf
new file mode 100644
index 0000000..8eb241a
--- /dev/null
+++ b/builder/squash/portage/make.conf
@@ -0,0 +1,4 @@
+# Calculate path=/etc
+ACCEPT_LICENSE="*"
+source /var/lib/layman/make.conf
+
diff --git a/builder/squash/portage/world b/builder/squash/portage/world
index 73fe81c..754a6d2 100644
--- a/builder/squash/portage/world
+++ b/builder/squash/portage/world
@@ -1,2 +1,2 @@
-# Calculate append=replace
+# Calculate append=replace path=/var/lib/portage
 app-misc/#-case(lower,os_builder_linux_shortname)-#-meta
diff --git a/install/merge/glibc/.calculate_directory b/install/merge/glibc/.calculate_directory
new file mode 100644
index 0000000..3b5b2b0
--- /dev/null
+++ b/install/merge/glibc/.calculate_directory
@@ -0,0 +1,2 @@
+# Calculate belong()!=&&cl_chroot_status!=&&pkg(sys-libs/glibc)!= name=etc
+
diff --git a/install/merge/glibc/locale.gen b/install/merge/glibc/locale.gen
new file mode 100644
index 0000000..24ca079
--- /dev/null
+++ b/install/merge/glibc/locale.gen
@@ -0,0 +1,39 @@
+# Calculate comment=#
+#Belarussian
+be_BY.UTF-8 UTF-8
+#Belgian
+fr_BE.UTF-8 UTF-8
+#Bulgarian
+bg_BG.UTF-8 UTF-8
+bg_BG CP1251
+#Brazilian Portuguese
+pt_BR.UTF-8 UTF-8
+#Canadian French
+fr_CA.UTF-8 UTF-8
+#Danish
+da_DK.UTF-8 UTF-8
+#French
+fr_FR.UTF-8 UTF-8
+#German
+de_DE.UTF-8 UTF-8
+#Icelandic
+is_IS.UTF-8 UTF-8
+#Italian
+it_IT.UTF-8 UTF-8
+#Norwegian
+nn_NO.UTF-8 UTF-8
+#Polish
+pl_PL.UTF-8 UTF-8
+#Russian
+ru_RU.UTF-8 UTF-8
+#Spanish
+es_ES.UTF-8 UTF-8
+#Swedish
+sv_SE.UTF-8 UTF-8
+#Ukrainian
+uk_UA.UTF-8 UTF-8
+#United Kingdom/British
+en_GB.UTF-8 UTF-8
+#United State/English
+en_US.UTF-8 UTF-8
+