diff --git a/config/layout.conf b/config/layout.conf
index 9aefb65..154b4d3 100644
--- a/config/layout.conf
+++ b/config/layout.conf
@@ -10,6 +10,10 @@ BINDIR="${STOREDIR}/bin"
 # builds (eg. stages).
 BUILDDIR="${STOREDIR}/builds"
 
+# Location of the intermediate metadata cache which is stored in a different format that
+# includes eclass state.
+ECACHEDIR="${STOREDIR}/cache"
+
 # Defines the directory in which overlays with user made ebuilds will be saved for further
 # merging with portage tree.
 OVERLAYSDIR="${STOREDIR}/overlays"
diff --git a/ezsync b/ezsync
index 60384d4..a086948 100755
--- a/ezsync
+++ b/ezsync
@@ -241,7 +241,7 @@ fi
 
 # Regenerate Portage cache
 printInfo "Updating constructed Portage cache..."
-run "FEATURES="metadata-transfer" PORTDIR="${PORTAGESDIR}/${PORTAGE_BUILD[0]}" egencache --update --portdir=${PORTAGESDIR}/${PORTAGE_BUILD[0]} --jobs=${MAXJOBS} --load-average=${LOADAVERAGE} --tolerant"
+run "FEATURES="metadata-transfer" PORTDIR="${PORTAGESDIR}/${PORTAGE_BUILD[0]}" egencache --update --cache-dir=${ECACHEDIR} --portdir=${PORTAGESDIR}/${PORTAGE_BUILD[0]} --jobs=${MAXJOBS} --load-average=${LOADAVERAGE} --tolerant"
 [ ${?} -ne 0 ] && die "EzBuild was unable to regenerate cache!" 32
 
 # Optionally commit all changes to remote Portage repository
diff --git a/libraries/common b/libraries/common
index a48d093..5dc2bf7 100644
--- a/libraries/common
+++ b/libraries/common
@@ -11,10 +11,6 @@ function checkPrerequisites() {
 		printError "You are trying to launch ${EZNAME} on non-Linux system!"
 		return 1
 	fi
-	if [ "${EUID}" != "0" ] && [ "${USER}" != "root" ]; then
-		printError "The ${EZNAME} needs to be launched from root account!"
-		return 1
-	fi
 	if [ ! -e /dev/null ]; then
 		printError "The /dev directory seems to be not mounted!"
 		return 1
@@ -174,9 +170,9 @@ function loadConfiguration() {
 	source ${EZROOT}/config/common.conf &> /dev/null || panic
 	source ${EZROOT}/config/${EZNAME}.conf &> /dev/null || panic
 	source ${EZROOT}/config/layout.conf &> /dev/null || panic
-	source /etc/ezbuild/common.conf &> /dev/null || panic
-	source /etc/ezbuild/${EZNAME}.conf &> /dev/null || panic
-	source /etc/ezbuild/layout.conf &> /dev/null || panic
+	source ~/.ezbuild/common.conf &> /dev/null || panic
+	source ~/.ezbuild/${EZNAME}.conf &> /dev/null || panic
+	source ~/.ezbuild/layout.conf &> /dev/null || panic
 }
 
 #-------------------------------------------------------------------------------
@@ -204,9 +200,9 @@ function loadModule() {
 		if [ -e ${MODULESCUSTOMDIR}/${MODULE}.conf ]; then
 			source ${EZROOT}/config/modules/${MODULE}.conf &> /dev/null
 			source ${MODULESCUSTOMDIR}/${MODULE}.conf &> /dev/null
-		elif [ -e /etc/ezbuild/modules/${MODULE}.conf ]; then
+		elif [ -e ~/.ezbuild/modules/${MODULE}.conf ]; then
 			source ${EZROOT}/config/modules/${MODULE}.conf &> /dev/null
-			source /etc/ezbuild/modules/${MODULE}.conf &> /dev/null
+			source ~/.ezbuild/modules/${MODULE}.conf &> /dev/null
 		fi
 		if [ ${?} -eq 0 ]; then
 			if functionExists ${FUNCTION}; then
diff --git a/libraries/filesystem b/libraries/filesystem
index 9c7dfb5..423b8c4 100644
--- a/libraries/filesystem
+++ b/libraries/filesystem
@@ -122,8 +122,8 @@ function makeCleanDirectory() {
 # Creates all 'core' directories necessary for EzBuild to operate
 #-------------------------------------------------------------------------------
 function makeCoreDirectories() {
-	local DIRS="${BINDIR} ${BUILDDIR} ${LOGFILE%/*} ${OVERLAYSDIR} \
-		${PACKAGESDIR} ${PORTAGESDIR} ${STOREDIR} ${TEMPDIR}"
+	local DIRS="${BINDIR} ${BUILDDIR} ${ECACHEDIR} ${LOGFILE%/*} \
+		${OVERLAYSDIR} ${PACKAGESDIR} ${PORTAGESDIR} ${STOREDIR} ${TEMPDIR}"
 	for DIR in ${DIRS}; do
 		makeDirectory ${DIR} || return 1
 	done