diff --git a/www/configs/config.inc b/www/configs/config.inc
index c9494306..f4444fa6 100644
--- a/www/configs/config.inc
+++ b/www/configs/config.inc
@@ -70,18 +70,6 @@ DEFINE('LOG', 'log'.DS);
 DEFINE('TEMPLATES_C', 'templates_c'.DS);
 // template base
 DEFINE('TEMPLATES', 'templates'.DS);
-// frontend template dir', only for admin
-DEFINE('TEMPLATES_FRONTEND', 'templates_frontend'.DS);
-
-// if below is turned to true then the old folder format is ued
-// www/layout/<admin|frontend>/<template name>/...
-// in the new layout the "<template name>" is dropped and only frontend
-// data is visible there: js, css, images
-// language files are moved into www/includes/lang/<admin/frontend>/*.mo
-// the language .po files are in 4dev/lang/<admin/frontend>/*.po
-DEFINE('USE_DEPRECATED_TEMPLATE_FOLDERS', false);
-// default template
-DEFINE('DEFAULT_TEMPLATE', 'default'.DS);
 
 /************* HASH / ACL DEFAULT / ERROR SETTINGS / SMARTY *************/
 // default hash type
diff --git a/www/includes/admin_set_paths.inc b/www/includes/admin_set_paths.inc
index ebd9a949..1cc01c42 100644
--- a/www/includes/admin_set_paths.inc
+++ b/www/includes/admin_set_paths.inc
@@ -7,242 +7,110 @@
 * HISTORY:
 *********************************************************************/
 
-// template path
-if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
-	if ($_SESSION['TEMPLATE']) {
-		$TEMPLATE = $_SESSION['TEMPLATE'];
-	} elseif ($LOCAL_TEMPLATE) {
-		$TEMPLATE = $LOCAL_TEMPLATE;
-	} else {
-		$TEMPLATE = DEFAULT_TEMPLATE;
-	}
-	$TEMPLATE_DIR = $TEMPLATE;
 
-	// master template
-	if (!$MASTER_TEMPLATE_NAME) {
-		$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
-	}
+// master template
+if (!isset($MASTER_TEMPLATE_NAME)) {
+	$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
+}
 
-	// just emergency fallback for language
-	// set encoding
-	if ($_SESSION['DEFAULT_CHARSET']) {
-		$encoding = $_SESSION['DEFAULT_CHARSET'];
-	} elseif (!$encoding) {
-		$encoding = DEFAULT_ENCODING;
-	}
-	// just emergency fallback for language
-	if ($_SESSION['DEFAULT_LANG']) {
-		$lang = $_SESSION['DEFAULT_LANG'];
-	} elseif (!$lang) {
-		$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
-	}
-	// create the char lang encoding
-	$lang_short = substr($lang, 0, 2);
+// just emergency fallback for language
+// set encoding
+if (isset($_SESSION['DEFAULT_CHARSET'])) {
+	$encoding = $_SESSION['DEFAULT_CHARSET'];
+} elseif (!isset($encoding)) {
+	$encoding = DEFAULT_ENCODING;
+}
+// just emergency fallback for language
+if (isset($_SESSION['DEFAULT_LANG'])) {
+	$lang = $_SESSION['DEFAULT_LANG'];
+} elseif (!isset($lang)) {
+	$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
+}
+// create the char lang encoding
+$lang_short = substr($lang, 0, 2);
 
-	// set include & template names
-	$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
-	$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
-	// set local page title
-	$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
-	// strip tpl and replace it with inc
-	// php include file per page
-	$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
-	// javascript include per page
-	$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
-	// css per page
-	$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
-	// special CSS file
-	$cms->CSS_SPECIAL_TEMPLATE_NAME = @$CSS_NAME;
-	// special JS file
-	$cms->JS_SPECIAL_TEMPLATE_NAME = @$JS_NAME;
+// set include & template names
+$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
+$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
+// set local page title
+$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
+// strip tpl and replace it with inc
+// php include file per page
+$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
+// javascript include per page
+$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
+// css per page
+$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
+// special CSS file
+$cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME;
+// special JS file
+$cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME;
 
-	// set basic template path (tmp)
-	$cms->template_path = LAYOUT.$TEMPLATE_DIR.TEMPLATES;
-	if ($smarty) {
-		$smarty->setTemplateDir($cms->template_path);
-	}
-	$cms->lang_dir = LAYOUT.$TEMPLATE_DIR.LANG; // no outside
-	$cms->includes = BASE.INCLUDES; // no longer in templates, only global
-	$cms->javascript = LAYOUT.$TEMPLATE_DIR.JS;
-	$cms->css = LAYOUT.$TEMPLATE_DIR.CSS;
-	$cms->pictures = LAYOUT.$TEMPLATE_DIR.IMAGES;
-	$cms->cache_pictures = LAYOUT.$TEMPLATE_DIR.CACHE;
-	$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-	if (!is_dir($cms->cache_pictures_root)) {
-		mkdir($cms->cache_pictures_root);
-	}
-
-	// if we don't find the master template, set the template path back AND set the insert template as absolute path
-	if (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.MASTER_TEMPLATE_NAME)) {
-		if (file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-			$TEMPLATE_NAME = ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME;
-		}
-		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-	} elseif (!file_exists(ROOT.$smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-		// check if the template exists in the template path, if not, set path to to default
-		$smarty->setTemplateDir(LAYOUT.DEFAULT_TEMPLATE.TEMPLATES);
-	}
-	// check if lang_dir folder exists in the template path, if not fall back to default
-	if (!is_dir($cms->lang_dir)) {
-		$cms->lang_dir = LAYOUT.DEFAULT_TEMPLATE.LANG;
-	}
-	// check if the javascript folder exists in the template path, if not fall back to default
-	if (!is_dir($cms->javascript)) {
-		$cms->javascript = LAYOUT.DEFAULT_TEMPLATE.JS;
-	}
-	// check if css folder exists in the template path, if not fall back to default
-	if (!is_dir($cms->css)) {
-		$cms->css = LAYOUT.DEFAULT_TEMPLATE.CSS;
-	}
-	if (!is_dir($cms->pictures)) {
-		$cms->pictures = LAYOUT.DEFAULT_TEMPLATE.PICTURES;
-	}
-	if (!is_dir($cms->cache_pictures)) {
-		$cms->cache_pictures = LAYOUT.DEFAULT_TEMPLATE.CACHE;
-		$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-	}
-
-	// if the template_dir is != DEFAULT_TEMPLATE, then try to make a lang switch
-	// if the default lang is not like the lang given, switch lang
-	if (false === strstr(LAYOUT.DEFAULT_TEMPLATE.LANG, $cms->lang_dir) ||
-		strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
-	) {
-		$cms->debug('LANG', 'Orig: '.LAYOUT.DEFAULT_TEMPLATE.LANG.', New: '.$cms->lang_dir.' | Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
-		$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
-			// if we have login class
-		if ($login) {
-			$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
-		}
-		// if we have smarty template class
-		if ($smarty) {
-			$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
-		}
-	}
-
-	// javascrip translate data as template for auto translate
-	if (!$TEMPLATE_TRANSLATE) {
-		$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
-		$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
-	} else {
-		// we assume we have some fixed set
-		// we must add _<$lang>
-		// if .tpl, put before .tpl
-		// if not .tpl, add _<$lang>.tpl
-		if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
-			$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
-		} else {
-			$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
-		}
-	}
-	// if we can't find it, dump it
-	if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
-		unset($TEMPLATE_TRANSLATE);
-	}
+// set basic template path (tmp)
+$cms->includes = BASE.INCLUDES; // no longer in templates, only global
+$cms->template_path = BASE.INCLUDES.TEMPLATES.CONTENT_PATH;
+if ($smarty) {
+	$smarty->setTemplateDir($cms->template_path);
+}
+if (isset($LANGUAGE_FOLDER)) {
+	$cms->kang_dir = $LANGUAGE_FOLDER;
 } else {
-	// master template
-	if (!isset($MASTER_TEMPLATE_NAME)) {
-		$MASTER_TEMPLATE_NAME = MASTER_TEMPLATE_NAME;
-	}
+	$cms->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH; // no outside
+}
+$cms->javascript = LAYOUT.JS;
+$cms->css = LAYOUT.CSS;
+$cms->pictures = LAYOUT.IMAGES;
+$cms->cache_pictures = LAYOUT.CACHE;
+$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
+if (!is_dir($cms->cache_pictures_root)) {
+	mkdir($cms->cache_pictures_root);
+}
 
-	// just emergency fallback for language
-	// set encoding
-	if (isset($_SESSION['DEFAULT_CHARSET'])) {
-		$encoding = $_SESSION['DEFAULT_CHARSET'];
-	} elseif (!isset($encoding)) {
-		$encoding = DEFAULT_ENCODING;
-	}
-	// just emergency fallback for language
-	if (isset($_SESSION['DEFAULT_LANG'])) {
-		$lang = $_SESSION['DEFAULT_LANG'];
-	} elseif (!isset($lang)) {
-		$lang = defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG;
-	}
-	// create the char lang encoding
-	$lang_short = substr($lang, 0, 2);
+// check if template names exist
+if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) {
+	// abort if master template could not be found
+	exit('MASTER TEMPLATE: '.$MASTER_TEMPLATE_NAME.' could not be found');
+}
+if (isset($TEMPLATE_NAME) && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
+	exit('INCLUDE TEMPLATE: '.$TEMPLATE_NAME.' could not be found');
+}
 
-	// set include & template names
-	$CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
-	$FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
-	// set local page title
-	$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
-	// strip tpl and replace it with inc
-	// php include file per page
-	$cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
-	// javascript include per page
-	$cms->JS_TEMPLATE_NAME = str_replace(".tpl", ".js", $CONTENT_INCLUDE);
-	// css per page
-	$cms->CSS_TEMPLATE_NAME = str_replace(".tpl", ".css", $CONTENT_INCLUDE);
-	// special CSS file
-	$cms->CSS_SPECIAL_TEMPLATE_NAME = $CSS_NAME;
-	// special JS file
-	$cms->JS_SPECIAL_TEMPLATE_NAME = $JS_NAME;
-
-	// set basic template path (tmp)
-	$cms->includes = BASE.INCLUDES; // no longer in templates, only global
-	$cms->template_path = BASE.INCLUDES.TEMPLATES.CONTENT_PATH;
+// if the lang folder is different to the default one
+// if the default lang is not like the lang given, switch lang
+if (false === strstr(BASE.INCLUDES.LANG.CONTENT_PATH, $cms->lang_dir) ||
+	strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
+) {
+	$cms->debug('LANG', 'Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
+	$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
+		// if we have login class
+	if ($login) {
+		$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
+	}
+	// if we have smarty template class
 	if ($smarty) {
-		$smarty->setTemplateDir($cms->template_path);
+		$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
 	}
-	if (isset($LANGUAGE_FOLDER)) {
-		$cms->kang_dir = $LANGUAGE_FOLDER;
+}
+
+// javascrip translate data as template for auto translate
+if (!$TEMPLATE_TRANSLATE) {
+	$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
+	$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
+} else {
+	// we assume we have some fixed set
+	// we must add _<$lang>
+	// if .tpl, put before .tpl
+	// if not .tpl, add _<$lang>.tpl
+	if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
+		$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
 	} else {
-		$cms->lang_dir = BASE.INCLUDES.LANG.CONTENT_PATH; // no outside
-	}
-	$cms->javascript = LAYOUT.JS;
-	$cms->css = LAYOUT.CSS;
-	$cms->pictures = LAYOUT.IMAGES;
-	$cms->cache_pictures = LAYOUT.CACHE;
-	$cms->cache_pictures_root = ROOT.$cms->cache_pictures;
-	if (!is_dir($cms->cache_pictures_root)) {
-		mkdir($cms->cache_pictures_root);
-	}
-
-	// check if template names exist
-	if (!file_exists($smarty->getTemplateDir()[0].DS.$MASTER_TEMPLATE_NAME)) {
-		// abort if master template could not be found
-		exit('MASTER TEMPLATE: '.$MASTER_TEMPLATE_NAME.' could not be found');
-	}
-	if (isset($TEMPLATE_NAME) && !file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_NAME)) {
-		exit('INCLUDE TEMPLATE: '.$TEMPLATE_NAME.' could not be found');
-	}
-
-	// if the lang folder is different to the default one
-	// if the default lang is not like the lang given, switch lang
-	if (false === strstr(BASE.INCLUDES.LANG.CONTENT_PATH, $cms->lang_dir) ||
-		strcasecmp(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG, $lang)
-	) {
-		$cms->debug('LANG', 'Orig Lang: '.(defined('SITE_LANG') ? SITE_LANG : DEFAULT_LANG).', New Lang: '.$lang);
-		$cms->l->l10nReloadMOfile($lang, $cms->lang_dir);
-			// if we have login class
-		if ($login) {
-			$login->l->l10nReloadMOfile($lang, $cms->lang_dir);
-		}
-		// if we have smarty template class
-		if ($smarty) {
-			$smarty->l10n->l10nReloadMOfile($lang, $cms->lang_dir);
-		}
-	}
-
-	// javascrip translate data as template for auto translate
-	if (!$TEMPLATE_TRANSLATE) {
-		$TEMPLATE_TRANSLATE = 'jsTranslate_'.$lang.'.tpl';
-		$cms->debug('LANG', 'Load lang: '.$lang.', for page file '.$TEMPLATE_TRANSLATE);
-	} else {
-		// we assume we have some fixed set
-		// we must add _<$lang>
-		// if .tpl, put before .tpl
-		// if not .tpl, add _<$lang>.tpl
-		if (strpos($TEMPLATE_TRANSLATE, '.tpl')) {
-			$TEMPLATE_TRANSLATE = str_replace('.tpl', '_'.$lang.'.tpl', $TEMPLATE_TRANSLATE);
-		} else {
-			$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
-		}
-	}
-	// if we can't find it, dump it
-	if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
-		unset($TEMPLATE_TRANSLATE);
+		$TEMPLATE_TRANSLATE .= '_'.$lang.'.tpl';
 	}
 }
+// if we can't find it, dump it
+if (!file_exists($smarty->getTemplateDir()[0].DS.$TEMPLATE_TRANSLATE)) {
+	unset($TEMPLATE_TRANSLATE);
+}
 
 //	$cms->debug("LANGUAGE", "L: $lang | ".$cms->lang_dir." | MO File: ".$cms->l->mofile);
 $cms->debug("LANGUAGE", "SL: ".$_SESSION['DEFAULT_CHARSET']." | ".$_SESSION['LANG']." | ".$_SESSION['DEFAULT_LANG']);
diff --git a/www/lib/CoreLibs/Basic.inc b/www/lib/CoreLibs/Basic.inc
index 719b4c83..70120f82 100644
--- a/www/lib/CoreLibs/Basic.inc
+++ b/www/lib/CoreLibs/Basic.inc
@@ -184,7 +184,7 @@ class Basic
 		foreach (array(
 			'DS', 'DIR', 'BASE', 'ROOT', 'LIB', 'INCLUDES', 'LAYOUT', 'PICTURES', 'FLASH', 'VIDEOS', 'DOCUMENTS', 'PDFS', 'BINARIES', 'ICONS',
 			'UPLOADS', 'CSV', 'JS', 'CSS', 'TABLE_ARRAYS', 'SMARTY', 'LANG', 'CACHE', 'TMP', 'LOG', 'TEMPLATES', 'TEMPLATES_C',
-			'TEMPLATES_FRONTEND', 'DEFAULT_TEMPLATE', 'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
+			'DEFAULT_LANG', 'DEFAULT_ENCODING', 'DEFAULT_HASH',
 			'DEFAULT_ACL_LEVEL', 'LOGOUT_TARGET', 'PASSWORD_CHANGE', 'AJAX_REQUEST_TYPE', 'USE_PROTOTYPE', 'USE_SCRIPTACULOUS', 'USE_JQUERY',
 			'PAGE_WIDTH', 'MASTER_TEMPLATE_NAME', 'PUBLIC_SCHEMA', 'TEST_SCHEMA', 'DEV_SCHEMA', 'LIVE_SCHEMA', 'LOGIN_DB', 'MAIN_DB', 'DB_SCHEMA',
 			'LOGIN_DB_SCHEMA', 'GLOBAL_DB_SCHEMA', 'TARGET', 'DEBUG', 'SHOW_ALL_ERRORS'
diff --git a/www/lib/CoreLibs/Language/L10n.inc b/www/lib/CoreLibs/Language/L10n.inc
index ec95d64c..20faa623 100644
--- a/www/lib/CoreLibs/Language/L10n.inc
+++ b/www/lib/CoreLibs/Language/L10n.inc
@@ -35,7 +35,7 @@ class L10n extends \CoreLibs\Basic
 	private $input;
 	private $l10n;
 
-	public function __construct($lang = '', $path = DEFAULT_TEMPLATE)
+	public function __construct($lang = '', $path = '')
 	{
 		if (!$lang) {
 			$this->lang = 'en';
@@ -43,17 +43,9 @@ class L10n extends \CoreLibs\Basic
 			$this->lang = $lang;
 		}
 
-		if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
-			if (is_dir(LAYOUT.$path.LANG)) {
-				$path = LAYOUT.$path.LANG;
-			} elseif (!is_dir($path)) {
-				$path = '';
-			}
-		} else {
-			// override path check
-			if (!is_dir($path)) {
-				$path = INCLUDES.LANG.CONTENT_PATH;
-			}
+		// override path check
+		if (!is_dir($path)) {
+			$path = INCLUDES.LANG.CONTENT_PATH;
 		}
 
 		$this->mofile = $path.$this->lang.".mo";
@@ -68,7 +60,7 @@ class L10n extends \CoreLibs\Basic
 	}
 
 	// reloads the mofile, if the location of the lang file changes
-	public function l10nReloadMOfile($lang, $path = DEFAULT_TEMPLATE)
+	public function l10nReloadMOfile($lang, $path = '')
 	{
 		$success = false;
 		$old_mofile = $this->mofile;
@@ -76,17 +68,9 @@ class L10n extends \CoreLibs\Basic
 
 		$this->lang = $lang;
 
-		if (USE_DEPRECATED_TEMPLATE_FOLDERS === true) {
-			if (is_dir(LAYOUT.$path.LANG)) {
-				$path = LAYOUT.$path.LANG;
-			} elseif (!is_dir($path)) {
-				$path = '';
-			}
-		} else {
-			// override path check
-			if (!is_dir($path)) {
-				$path = INCLUDES.LANG.CONTENT_PATH;
-			}
+		// override path check
+		if (!is_dir($path)) {
+			$path = INCLUDES.LANG.CONTENT_PATH;
 		}
 
 		$this->mofile = $path.$this->lang.".mo";