diff --git a/Zotlabs/Render/SmartyTemplate.php b/Zotlabs/Render/SmartyTemplate.php
index 79f03637b..a4ae8b68a 100644
--- a/Zotlabs/Render/SmartyTemplate.php
+++ b/Zotlabs/Render/SmartyTemplate.php
@@ -72,7 +72,7 @@ class SmartyTemplate implements TemplateEngine {
 		if ($root != '' && substr($root,-1) != '/' ) {
 			$root .= '/';
 		}
-		foreach ( [ $root . "view/$lang/$file", $root . "view/en/$file", '' ] as $template_file) {
+		foreach ( [ $root . "view/lang/$lang/$file", $root . "view/lang/en/$file", '' ] as $template_file) {
 			if (is_file($template_file)) {
 				break;
 			}
diff --git a/include/language.php b/include/language.php
index 9b68717f8..5d7e834d4 100644
--- a/include/language.php
+++ b/include/language.php
@@ -68,7 +68,7 @@ function get_best_language() {
 	if(isset($langs) && count($langs)) {
 		foreach ($langs as $lang => $v) {
 			$lang = strtolower($lang);
-			if(is_dir("view/$lang")) {
+			if(is_dir("view/lang/$lang")) {
 				$preferred = $lang;
 				break;
 			}
@@ -93,7 +93,7 @@ function get_best_language() {
 				}
 				/* Check the base */
 				$lang = strtolower(substr($lang,0,2));
-				if(is_dir("view/$lang")) {
+				if(is_dir("view/lang/$lang")) {
 					$preferred = $lang;
 					break;
 				}
@@ -160,11 +160,11 @@ function load_translation_table($lang, $install = false) {
 
 	App::$strings = array();
 
-	if(file_exists("view/$lang/hstrings.php")) {
-		include("view/$lang/hstrings.php");
+	if(file_exists("view/lang/$lang/hstrings.php")) {
+		include("view/lang/$lang/hstrings.php");
 	}
-	elseif(file_exists("view/$lang/strings.php")) {
-		include("view/$lang/strings.php");
+	elseif(file_exists("view/lang/$lang/strings.php")) {
+		include("view/lang/$lang/strings.php");
 	}
 
 	if(! $install) {
@@ -185,11 +185,11 @@ function load_translation_table($lang, $install = false) {
 	// Allow individual strings to be over-ridden on this site
 	// Either for the default language or for all languages
 
-	if(file_exists("view/local-$lang/hstrings.php")) {
-		include("view/local-$lang/hstrings.php");
+	if(file_exists("view/lang/local-$lang/hstrings.php")) {
+		include("view/lang/local-$lang/hstrings.php");
 	}
-	elseif(file_exists("view/local-$lang/strings.php")) {
-		include("view/local-$lang/strings.php");
+	elseif(file_exists("view/lang/local-$lang/strings.php")) {
+		include("view/lang/local-$lang/strings.php");
 	}
 }
 
@@ -387,16 +387,16 @@ function get_language_name($s, $l = null) {
 
 function language_list() {
 
-	$langs = glob('view/*/hstrings.php');
+	$langs = glob('view/lang/*/hstrings.php');
 
 	$lang_options = array();
 
 	if(is_array($langs) && count($langs)) {
-		if(! in_array('view/en/hstrings.php',$langs))
-			$langs[] = 'view/en/';
+		if(! in_array('view/lang/en/hstrings.php',$langs))
+			$langs[] = 'view/lang/en/';
 		asort($langs);
 		foreach($langs as $l) {
-			$ll = substr($l,5);
+			$ll = substr($l,10);
 			$ll = substr($ll,0,strrpos($ll,'/'));
 			$lang_options[$ll] = get_language_name($ll, $ll) . " ($ll)";
 		}
diff --git a/view/ca/hmessages.po b/view/lang/ca/hmessages.po
similarity index 100%
rename from view/ca/hmessages.po
rename to view/lang/ca/hmessages.po
diff --git a/view/ca/hstrings.php b/view/lang/ca/hstrings.php
similarity index 100%
rename from view/ca/hstrings.php
rename to view/lang/ca/hstrings.php
diff --git a/view/ca/lostpass_eml.tpl b/view/lang/ca/lostpass_eml.tpl
similarity index 100%
rename from view/ca/lostpass_eml.tpl
rename to view/lang/ca/lostpass_eml.tpl
diff --git a/view/ca/messages.po b/view/lang/ca/messages.po
similarity index 100%
rename from view/ca/messages.po
rename to view/lang/ca/messages.po
diff --git a/view/ca/passchanged_eml.tpl b/view/lang/ca/passchanged_eml.tpl
similarity index 100%
rename from view/ca/passchanged_eml.tpl
rename to view/lang/ca/passchanged_eml.tpl
diff --git a/view/ca/register_open_eml.tpl b/view/lang/ca/register_open_eml.tpl
similarity index 100%
rename from view/ca/register_open_eml.tpl
rename to view/lang/ca/register_open_eml.tpl
diff --git a/view/ca/register_verify_eml.tpl b/view/lang/ca/register_verify_eml.tpl
similarity index 100%
rename from view/ca/register_verify_eml.tpl
rename to view/lang/ca/register_verify_eml.tpl
diff --git a/view/ca/strings.php b/view/lang/ca/strings.php
similarity index 100%
rename from view/ca/strings.php
rename to view/lang/ca/strings.php
diff --git a/view/ca/update_fail_eml.tpl b/view/lang/ca/update_fail_eml.tpl
similarity index 100%
rename from view/ca/update_fail_eml.tpl
rename to view/lang/ca/update_fail_eml.tpl
diff --git a/view/de b/view/lang/de
similarity index 100%
rename from view/de
rename to view/lang/de
diff --git a/view/de-de/hmessages.po b/view/lang/de-de/hmessages.po
similarity index 100%
rename from view/de-de/hmessages.po
rename to view/lang/de-de/hmessages.po
diff --git a/view/de-de/hstrings.php b/view/lang/de-de/hstrings.php
similarity index 100%
rename from view/de-de/hstrings.php
rename to view/lang/de-de/hstrings.php
diff --git a/view/de-de/invite.casual.subject.tpl b/view/lang/de-de/invite.casual.subject.tpl
similarity index 100%
rename from view/de-de/invite.casual.subject.tpl
rename to view/lang/de-de/invite.casual.subject.tpl
diff --git a/view/de-de/invite.casual.tpl b/view/lang/de-de/invite.casual.tpl
similarity index 100%
rename from view/de-de/invite.casual.tpl
rename to view/lang/de-de/invite.casual.tpl
diff --git a/view/de-de/invite.formal.subject.tpl b/view/lang/de-de/invite.formal.subject.tpl
similarity index 100%
rename from view/de-de/invite.formal.subject.tpl
rename to view/lang/de-de/invite.formal.subject.tpl
diff --git a/view/de-de/invite.formal.tpl b/view/lang/de-de/invite.formal.tpl
similarity index 100%
rename from view/de-de/invite.formal.tpl
rename to view/lang/de-de/invite.formal.tpl
diff --git a/view/de-de/lostpass_eml.tpl b/view/lang/de-de/lostpass_eml.tpl
similarity index 100%
rename from view/de-de/lostpass_eml.tpl
rename to view/lang/de-de/lostpass_eml.tpl
diff --git a/view/de-de/messages.po b/view/lang/de-de/messages.po
similarity index 100%
rename from view/de-de/messages.po
rename to view/lang/de-de/messages.po
diff --git a/view/de-de/passchanged_eml.tpl b/view/lang/de-de/passchanged_eml.tpl
similarity index 100%
rename from view/de-de/passchanged_eml.tpl
rename to view/lang/de-de/passchanged_eml.tpl
diff --git a/view/de-de/register_open_eml.tpl b/view/lang/de-de/register_open_eml.tpl
similarity index 100%
rename from view/de-de/register_open_eml.tpl
rename to view/lang/de-de/register_open_eml.tpl
diff --git a/view/de-de/register_verify_eml.tpl b/view/lang/de-de/register_verify_eml.tpl
similarity index 100%
rename from view/de-de/register_verify_eml.tpl
rename to view/lang/de-de/register_verify_eml.tpl
diff --git a/view/de-de/register_verify_member.tpl b/view/lang/de-de/register_verify_member.tpl
similarity index 100%
rename from view/de-de/register_verify_member.tpl
rename to view/lang/de-de/register_verify_member.tpl
diff --git a/view/de-de/strings.php b/view/lang/de-de/strings.php
similarity index 100%
rename from view/de-de/strings.php
rename to view/lang/de-de/strings.php
diff --git a/view/de-de/update_fail_eml.tpl b/view/lang/de-de/update_fail_eml.tpl
similarity index 100%
rename from view/de-de/update_fail_eml.tpl
rename to view/lang/de-de/update_fail_eml.tpl
diff --git a/view/en-au/hstrings.php b/view/lang/en-au/hstrings.php
similarity index 72%
rename from view/en-au/hstrings.php
rename to view/lang/en-au/hstrings.php
index 95f8c4e00..b40739e0e 100644
--- a/view/en-au/hstrings.php
+++ b/view/lang/en-au/hstrings.php
@@ -1,5 +1,5 @@
 <?php
-require_once('view/en-gb/strings.php');
+require_once('view/lang/en-gb/strings.php');
 App::$strings['Welcome %s. Remote authentication successful.'] = "G'day %s. Remote authentication successful";
 
 
diff --git a/view/en-au/lostpass_eml.tpl b/view/lang/en-au/lostpass_eml.tpl
similarity index 100%
rename from view/en-au/lostpass_eml.tpl
rename to view/lang/en-au/lostpass_eml.tpl
diff --git a/view/en-au/passchanged_eml.tpl b/view/lang/en-au/passchanged_eml.tpl
similarity index 100%
rename from view/en-au/passchanged_eml.tpl
rename to view/lang/en-au/passchanged_eml.tpl
diff --git a/view/en-au/register_open_eml.tpl b/view/lang/en-au/register_open_eml.tpl
similarity index 100%
rename from view/en-au/register_open_eml.tpl
rename to view/lang/en-au/register_open_eml.tpl
diff --git a/view/en-au/register_verify_eml.tpl b/view/lang/en-au/register_verify_eml.tpl
similarity index 100%
rename from view/en-au/register_verify_eml.tpl
rename to view/lang/en-au/register_verify_eml.tpl
diff --git a/view/en-au/register_verify_member.tpl b/view/lang/en-au/register_verify_member.tpl
similarity index 100%
rename from view/en-au/register_verify_member.tpl
rename to view/lang/en-au/register_verify_member.tpl
diff --git a/view/en-au/strings.php b/view/lang/en-au/strings.php
similarity index 72%
rename from view/en-au/strings.php
rename to view/lang/en-au/strings.php
index 95f8c4e00..b40739e0e 100644
--- a/view/en-au/strings.php
+++ b/view/lang/en-au/strings.php
@@ -1,5 +1,5 @@
 <?php
-require_once('view/en-gb/strings.php');
+require_once('view/lang/en-gb/strings.php');
 App::$strings['Welcome %s. Remote authentication successful.'] = "G'day %s. Remote authentication successful";
 
 
diff --git a/view/en-au/update_fail_eml.tpl b/view/lang/en-au/update_fail_eml.tpl
similarity index 100%
rename from view/en-au/update_fail_eml.tpl
rename to view/lang/en-au/update_fail_eml.tpl
diff --git a/view/en-gb/hstrings.php b/view/lang/en-gb/hstrings.php
similarity index 100%
rename from view/en-gb/hstrings.php
rename to view/lang/en-gb/hstrings.php
diff --git a/view/en-gb/lostpass_eml.tpl b/view/lang/en-gb/lostpass_eml.tpl
similarity index 100%
rename from view/en-gb/lostpass_eml.tpl
rename to view/lang/en-gb/lostpass_eml.tpl
diff --git a/view/en-gb/passchanged_eml.tpl b/view/lang/en-gb/passchanged_eml.tpl
similarity index 100%
rename from view/en-gb/passchanged_eml.tpl
rename to view/lang/en-gb/passchanged_eml.tpl
diff --git a/view/en-gb/register_open_eml.tpl b/view/lang/en-gb/register_open_eml.tpl
similarity index 100%
rename from view/en-gb/register_open_eml.tpl
rename to view/lang/en-gb/register_open_eml.tpl
diff --git a/view/en-gb/register_verify_eml.tpl b/view/lang/en-gb/register_verify_eml.tpl
similarity index 100%
rename from view/en-gb/register_verify_eml.tpl
rename to view/lang/en-gb/register_verify_eml.tpl
diff --git a/view/en-gb/register_verify_member.tpl b/view/lang/en-gb/register_verify_member.tpl
similarity index 100%
rename from view/en-gb/register_verify_member.tpl
rename to view/lang/en-gb/register_verify_member.tpl
diff --git a/view/en-gb/strings.php b/view/lang/en-gb/strings.php
similarity index 100%
rename from view/en-gb/strings.php
rename to view/lang/en-gb/strings.php
diff --git a/view/en-gb/update_fail_eml.tpl b/view/lang/en-gb/update_fail_eml.tpl
similarity index 100%
rename from view/en-gb/update_fail_eml.tpl
rename to view/lang/en-gb/update_fail_eml.tpl
diff --git a/view/en/cert_bad_eml.tpl b/view/lang/en/cert_bad_eml.tpl
similarity index 100%
rename from view/en/cert_bad_eml.tpl
rename to view/lang/en/cert_bad_eml.tpl
diff --git a/view/en/cron_bad_eml.tpl b/view/lang/en/cron_bad_eml.tpl
similarity index 100%
rename from view/en/cron_bad_eml.tpl
rename to view/lang/en/cron_bad_eml.tpl
diff --git a/view/en/htconfig.tpl b/view/lang/en/htconfig.tpl
similarity index 100%
rename from view/en/htconfig.tpl
rename to view/lang/en/htconfig.tpl
diff --git a/view/en/invite.casual.subject.tpl b/view/lang/en/invite.casual.subject.tpl
similarity index 100%
rename from view/en/invite.casual.subject.tpl
rename to view/lang/en/invite.casual.subject.tpl
diff --git a/view/en/invite.casual.tpl b/view/lang/en/invite.casual.tpl
similarity index 100%
rename from view/en/invite.casual.tpl
rename to view/lang/en/invite.casual.tpl
diff --git a/view/en/invite.formal.subject.tpl b/view/lang/en/invite.formal.subject.tpl
similarity index 100%
rename from view/en/invite.formal.subject.tpl
rename to view/lang/en/invite.formal.subject.tpl
diff --git a/view/en/invite.formal.tpl b/view/lang/en/invite.formal.tpl
similarity index 100%
rename from view/en/invite.formal.tpl
rename to view/lang/en/invite.formal.tpl
diff --git a/view/en/invite.material.subject.tpl b/view/lang/en/invite.material.subject.tpl
similarity index 100%
rename from view/en/invite.material.subject.tpl
rename to view/lang/en/invite.material.subject.tpl
diff --git a/view/en/invite.material.tpl b/view/lang/en/invite.material.tpl
similarity index 100%
rename from view/en/invite.material.tpl
rename to view/lang/en/invite.material.tpl
diff --git a/view/en/lostpass_eml.tpl b/view/lang/en/lostpass_eml.tpl
similarity index 100%
rename from view/en/lostpass_eml.tpl
rename to view/lang/en/lostpass_eml.tpl
diff --git a/view/en/passchanged_eml.tpl b/view/lang/en/passchanged_eml.tpl
similarity index 100%
rename from view/en/passchanged_eml.tpl
rename to view/lang/en/passchanged_eml.tpl
diff --git a/view/en/register_open_eml.tpl b/view/lang/en/register_open_eml.tpl
similarity index 100%
rename from view/en/register_open_eml.tpl
rename to view/lang/en/register_open_eml.tpl
diff --git a/view/en/register_verify_eml.tpl b/view/lang/en/register_verify_eml.tpl
similarity index 100%
rename from view/en/register_verify_eml.tpl
rename to view/lang/en/register_verify_eml.tpl
diff --git a/view/en/register_verify_member.tpl b/view/lang/en/register_verify_member.tpl
similarity index 100%
rename from view/en/register_verify_member.tpl
rename to view/lang/en/register_verify_member.tpl
diff --git a/view/en/update_fail_eml.tpl b/view/lang/en/update_fail_eml.tpl
similarity index 100%
rename from view/en/update_fail_eml.tpl
rename to view/lang/en/update_fail_eml.tpl
diff --git a/view/es b/view/lang/es
similarity index 100%
rename from view/es
rename to view/lang/es
diff --git a/view/es-es/hmessages.po b/view/lang/es-es/hmessages.po
similarity index 100%
rename from view/es-es/hmessages.po
rename to view/lang/es-es/hmessages.po
diff --git a/view/es-es/hstrings.php b/view/lang/es-es/hstrings.php
similarity index 100%
rename from view/es-es/hstrings.php
rename to view/lang/es-es/hstrings.php
diff --git a/view/es-es/invite.casual.subject.tpl b/view/lang/es-es/invite.casual.subject.tpl
similarity index 100%
rename from view/es-es/invite.casual.subject.tpl
rename to view/lang/es-es/invite.casual.subject.tpl
diff --git a/view/es-es/invite.casual.tpl b/view/lang/es-es/invite.casual.tpl
similarity index 100%
rename from view/es-es/invite.casual.tpl
rename to view/lang/es-es/invite.casual.tpl
diff --git a/view/es-es/invite.formal.subject.tpl b/view/lang/es-es/invite.formal.subject.tpl
similarity index 100%
rename from view/es-es/invite.formal.subject.tpl
rename to view/lang/es-es/invite.formal.subject.tpl
diff --git a/view/es-es/invite.formal.tpl b/view/lang/es-es/invite.formal.tpl
similarity index 100%
rename from view/es-es/invite.formal.tpl
rename to view/lang/es-es/invite.formal.tpl
diff --git a/view/es-es/lostpass_eml.tpl b/view/lang/es-es/lostpass_eml.tpl
similarity index 100%
rename from view/es-es/lostpass_eml.tpl
rename to view/lang/es-es/lostpass_eml.tpl
diff --git a/view/es-es/messages.po b/view/lang/es-es/messages.po
similarity index 100%
rename from view/es-es/messages.po
rename to view/lang/es-es/messages.po
diff --git a/view/es-es/passchanged_eml.tpl b/view/lang/es-es/passchanged_eml.tpl
similarity index 100%
rename from view/es-es/passchanged_eml.tpl
rename to view/lang/es-es/passchanged_eml.tpl
diff --git a/view/es-es/register_open_eml.tpl b/view/lang/es-es/register_open_eml.tpl
similarity index 100%
rename from view/es-es/register_open_eml.tpl
rename to view/lang/es-es/register_open_eml.tpl
diff --git a/view/es-es/register_verify_eml.tpl b/view/lang/es-es/register_verify_eml.tpl
similarity index 100%
rename from view/es-es/register_verify_eml.tpl
rename to view/lang/es-es/register_verify_eml.tpl
diff --git a/view/es-es/register_verify_member.tpl b/view/lang/es-es/register_verify_member.tpl
similarity index 100%
rename from view/es-es/register_verify_member.tpl
rename to view/lang/es-es/register_verify_member.tpl
diff --git a/view/es-es/strings.php b/view/lang/es-es/strings.php
similarity index 100%
rename from view/es-es/strings.php
rename to view/lang/es-es/strings.php
diff --git a/view/es-es/update_fail_eml.tpl b/view/lang/es-es/update_fail_eml.tpl
similarity index 100%
rename from view/es-es/update_fail_eml.tpl
rename to view/lang/es-es/update_fail_eml.tpl
diff --git a/view/fr/cert_bad_eml.tpl b/view/lang/fr/cert_bad_eml.tpl
similarity index 100%
rename from view/fr/cert_bad_eml.tpl
rename to view/lang/fr/cert_bad_eml.tpl
diff --git a/view/fr/cron_bad_eml.tpl b/view/lang/fr/cron_bad_eml.tpl
similarity index 100%
rename from view/fr/cron_bad_eml.tpl
rename to view/lang/fr/cron_bad_eml.tpl
diff --git a/view/fr/hmessages.po b/view/lang/fr/hmessages.po
similarity index 100%
rename from view/fr/hmessages.po
rename to view/lang/fr/hmessages.po
diff --git a/view/fr/hstrings.php b/view/lang/fr/hstrings.php
similarity index 100%
rename from view/fr/hstrings.php
rename to view/lang/fr/hstrings.php
diff --git a/view/fr/htconfig.tpl b/view/lang/fr/htconfig.tpl
similarity index 100%
rename from view/fr/htconfig.tpl
rename to view/lang/fr/htconfig.tpl
diff --git a/view/fr/invite.casual.subject.tpl b/view/lang/fr/invite.casual.subject.tpl
similarity index 100%
rename from view/fr/invite.casual.subject.tpl
rename to view/lang/fr/invite.casual.subject.tpl
diff --git a/view/fr/invite.casual.tpl b/view/lang/fr/invite.casual.tpl
similarity index 100%
rename from view/fr/invite.casual.tpl
rename to view/lang/fr/invite.casual.tpl
diff --git a/view/fr/invite.formal.subject.tpl b/view/lang/fr/invite.formal.subject.tpl
similarity index 100%
rename from view/fr/invite.formal.subject.tpl
rename to view/lang/fr/invite.formal.subject.tpl
diff --git a/view/fr/invite.formal.tpl b/view/lang/fr/invite.formal.tpl
similarity index 100%
rename from view/fr/invite.formal.tpl
rename to view/lang/fr/invite.formal.tpl
diff --git a/view/fr/invite.material.subject.tpl b/view/lang/fr/invite.material.subject.tpl
similarity index 100%
rename from view/fr/invite.material.subject.tpl
rename to view/lang/fr/invite.material.subject.tpl
diff --git a/view/fr/invite.material.tpl b/view/lang/fr/invite.material.tpl
similarity index 100%
rename from view/fr/invite.material.tpl
rename to view/lang/fr/invite.material.tpl
diff --git a/view/fr/lostpass_eml.tpl b/view/lang/fr/lostpass_eml.tpl
similarity index 100%
rename from view/fr/lostpass_eml.tpl
rename to view/lang/fr/lostpass_eml.tpl
diff --git a/view/fr/messages.po b/view/lang/fr/messages.po
similarity index 100%
rename from view/fr/messages.po
rename to view/lang/fr/messages.po
diff --git a/view/fr/passchanged_eml.tpl b/view/lang/fr/passchanged_eml.tpl
similarity index 100%
rename from view/fr/passchanged_eml.tpl
rename to view/lang/fr/passchanged_eml.tpl
diff --git a/view/fr/register_open_eml.tpl b/view/lang/fr/register_open_eml.tpl
similarity index 100%
rename from view/fr/register_open_eml.tpl
rename to view/lang/fr/register_open_eml.tpl
diff --git a/view/fr/register_verify_eml.tpl b/view/lang/fr/register_verify_eml.tpl
similarity index 100%
rename from view/fr/register_verify_eml.tpl
rename to view/lang/fr/register_verify_eml.tpl
diff --git a/view/fr/register_verify_member.tpl b/view/lang/fr/register_verify_member.tpl
similarity index 100%
rename from view/fr/register_verify_member.tpl
rename to view/lang/fr/register_verify_member.tpl
diff --git a/view/fr/strings.php b/view/lang/fr/strings.php
similarity index 100%
rename from view/fr/strings.php
rename to view/lang/fr/strings.php
diff --git a/view/fr/update_fail_eml.tpl b/view/lang/fr/update_fail_eml.tpl
similarity index 100%
rename from view/fr/update_fail_eml.tpl
rename to view/lang/fr/update_fail_eml.tpl
diff --git a/view/he/hmessages.po b/view/lang/he/hmessages.po
similarity index 100%
rename from view/he/hmessages.po
rename to view/lang/he/hmessages.po
diff --git a/view/he/hstrings.php b/view/lang/he/hstrings.php
similarity index 100%
rename from view/he/hstrings.php
rename to view/lang/he/hstrings.php
diff --git a/view/he/lostpass_eml.tpl b/view/lang/he/lostpass_eml.tpl
similarity index 100%
rename from view/he/lostpass_eml.tpl
rename to view/lang/he/lostpass_eml.tpl
diff --git a/view/he/messages.po b/view/lang/he/messages.po
similarity index 100%
rename from view/he/messages.po
rename to view/lang/he/messages.po
diff --git a/view/he/passchanged_eml.tpl b/view/lang/he/passchanged_eml.tpl
similarity index 100%
rename from view/he/passchanged_eml.tpl
rename to view/lang/he/passchanged_eml.tpl
diff --git a/view/he/register_open_eml.tpl b/view/lang/he/register_open_eml.tpl
similarity index 100%
rename from view/he/register_open_eml.tpl
rename to view/lang/he/register_open_eml.tpl
diff --git a/view/he/register_verify_eml.tpl b/view/lang/he/register_verify_eml.tpl
similarity index 100%
rename from view/he/register_verify_eml.tpl
rename to view/lang/he/register_verify_eml.tpl
diff --git a/view/he/register_verify_member.tpl b/view/lang/he/register_verify_member.tpl
similarity index 100%
rename from view/he/register_verify_member.tpl
rename to view/lang/he/register_verify_member.tpl
diff --git a/view/he/strings.php b/view/lang/he/strings.php
similarity index 100%
rename from view/he/strings.php
rename to view/lang/he/strings.php
diff --git a/view/he/update_fail_eml.tpl b/view/lang/he/update_fail_eml.tpl
similarity index 100%
rename from view/he/update_fail_eml.tpl
rename to view/lang/he/update_fail_eml.tpl
diff --git a/view/it/hmessages.po b/view/lang/it/hmessages.po
similarity index 100%
rename from view/it/hmessages.po
rename to view/lang/it/hmessages.po
diff --git a/view/it/hstrings.php b/view/lang/it/hstrings.php
similarity index 100%
rename from view/it/hstrings.php
rename to view/lang/it/hstrings.php
diff --git a/view/it/lostpass_eml.tpl b/view/lang/it/lostpass_eml.tpl
similarity index 100%
rename from view/it/lostpass_eml.tpl
rename to view/lang/it/lostpass_eml.tpl
diff --git a/view/it/messages.po b/view/lang/it/messages.po
similarity index 100%
rename from view/it/messages.po
rename to view/lang/it/messages.po
diff --git a/view/it/passchanged_eml.tpl b/view/lang/it/passchanged_eml.tpl
similarity index 100%
rename from view/it/passchanged_eml.tpl
rename to view/lang/it/passchanged_eml.tpl
diff --git a/view/it/register_open_eml.tpl b/view/lang/it/register_open_eml.tpl
similarity index 100%
rename from view/it/register_open_eml.tpl
rename to view/lang/it/register_open_eml.tpl
diff --git a/view/it/register_verify_eml.tpl b/view/lang/it/register_verify_eml.tpl
similarity index 100%
rename from view/it/register_verify_eml.tpl
rename to view/lang/it/register_verify_eml.tpl
diff --git a/view/it/register_verify_member.tpl b/view/lang/it/register_verify_member.tpl
similarity index 100%
rename from view/it/register_verify_member.tpl
rename to view/lang/it/register_verify_member.tpl
diff --git a/view/it/strings.php b/view/lang/it/strings.php
similarity index 100%
rename from view/it/strings.php
rename to view/lang/it/strings.php
diff --git a/view/it/update_fail_eml.tpl b/view/lang/it/update_fail_eml.tpl
similarity index 100%
rename from view/it/update_fail_eml.tpl
rename to view/lang/it/update_fail_eml.tpl
diff --git a/view/ja/.gitkeep b/view/lang/ja/.gitkeep
similarity index 100%
rename from view/ja/.gitkeep
rename to view/lang/ja/.gitkeep
diff --git a/view/ja/hmessages.po b/view/lang/ja/hmessages.po
similarity index 100%
rename from view/ja/hmessages.po
rename to view/lang/ja/hmessages.po
diff --git a/view/ja/hstrings.php b/view/lang/ja/hstrings.php
similarity index 100%
rename from view/ja/hstrings.php
rename to view/lang/ja/hstrings.php
diff --git a/view/nb/hmessages.po b/view/lang/nb/hmessages.po
similarity index 100%
rename from view/nb/hmessages.po
rename to view/lang/nb/hmessages.po
diff --git a/view/nb/hstrings.php b/view/lang/nb/hstrings.php
similarity index 100%
rename from view/nb/hstrings.php
rename to view/lang/nb/hstrings.php
diff --git a/view/nb/lostpass_eml.tpl b/view/lang/nb/lostpass_eml.tpl
similarity index 100%
rename from view/nb/lostpass_eml.tpl
rename to view/lang/nb/lostpass_eml.tpl
diff --git a/view/nb/messages.po b/view/lang/nb/messages.po
similarity index 100%
rename from view/nb/messages.po
rename to view/lang/nb/messages.po
diff --git a/view/nb/passchanged_eml.tpl b/view/lang/nb/passchanged_eml.tpl
similarity index 100%
rename from view/nb/passchanged_eml.tpl
rename to view/lang/nb/passchanged_eml.tpl
diff --git a/view/nb/register_open_eml.tpl b/view/lang/nb/register_open_eml.tpl
similarity index 100%
rename from view/nb/register_open_eml.tpl
rename to view/lang/nb/register_open_eml.tpl
diff --git a/view/nb/register_verify_eml.tpl b/view/lang/nb/register_verify_eml.tpl
similarity index 100%
rename from view/nb/register_verify_eml.tpl
rename to view/lang/nb/register_verify_eml.tpl
diff --git a/view/nb/strings.php b/view/lang/nb/strings.php
similarity index 100%
rename from view/nb/strings.php
rename to view/lang/nb/strings.php
diff --git a/view/nb/update_fail_eml.tpl b/view/lang/nb/update_fail_eml.tpl
similarity index 100%
rename from view/nb/update_fail_eml.tpl
rename to view/lang/nb/update_fail_eml.tpl
diff --git a/view/nl/hmessages.po b/view/lang/nl/hmessages.po
similarity index 100%
rename from view/nl/hmessages.po
rename to view/lang/nl/hmessages.po
diff --git a/view/nl/hstrings.php b/view/lang/nl/hstrings.php
similarity index 100%
rename from view/nl/hstrings.php
rename to view/lang/nl/hstrings.php
diff --git a/view/nl/lostpass_eml.tpl b/view/lang/nl/lostpass_eml.tpl
similarity index 100%
rename from view/nl/lostpass_eml.tpl
rename to view/lang/nl/lostpass_eml.tpl
diff --git a/view/nl/messages.po b/view/lang/nl/messages.po
similarity index 100%
rename from view/nl/messages.po
rename to view/lang/nl/messages.po
diff --git a/view/nl/passchanged_eml.tpl b/view/lang/nl/passchanged_eml.tpl
similarity index 100%
rename from view/nl/passchanged_eml.tpl
rename to view/lang/nl/passchanged_eml.tpl
diff --git a/view/nl/register_open_eml.tpl b/view/lang/nl/register_open_eml.tpl
similarity index 100%
rename from view/nl/register_open_eml.tpl
rename to view/lang/nl/register_open_eml.tpl
diff --git a/view/nl/register_verify_eml.tpl b/view/lang/nl/register_verify_eml.tpl
similarity index 100%
rename from view/nl/register_verify_eml.tpl
rename to view/lang/nl/register_verify_eml.tpl
diff --git a/view/nl/register_verify_member.tpl b/view/lang/nl/register_verify_member.tpl
similarity index 100%
rename from view/nl/register_verify_member.tpl
rename to view/lang/nl/register_verify_member.tpl
diff --git a/view/nl/strings.php b/view/lang/nl/strings.php
similarity index 100%
rename from view/nl/strings.php
rename to view/lang/nl/strings.php
diff --git a/view/nl/update_fail_eml.tpl b/view/lang/nl/update_fail_eml.tpl
similarity index 100%
rename from view/nl/update_fail_eml.tpl
rename to view/lang/nl/update_fail_eml.tpl
diff --git a/view/pl/cert_bad_eml.tpl b/view/lang/pl/cert_bad_eml.tpl
similarity index 100%
rename from view/pl/cert_bad_eml.tpl
rename to view/lang/pl/cert_bad_eml.tpl
diff --git a/view/pl/cron_bad_eml.tpl b/view/lang/pl/cron_bad_eml.tpl
similarity index 100%
rename from view/pl/cron_bad_eml.tpl
rename to view/lang/pl/cron_bad_eml.tpl
diff --git a/view/pl/hmessages.mo b/view/lang/pl/hmessages.mo
similarity index 100%
rename from view/pl/hmessages.mo
rename to view/lang/pl/hmessages.mo
diff --git a/view/pl/hmessages.po b/view/lang/pl/hmessages.po
similarity index 100%
rename from view/pl/hmessages.po
rename to view/lang/pl/hmessages.po
diff --git a/view/pl/hmessages.pot b/view/lang/pl/hmessages.pot
similarity index 100%
rename from view/pl/hmessages.pot
rename to view/lang/pl/hmessages.pot
diff --git a/view/pl/hstrings.php b/view/lang/pl/hstrings.php
similarity index 100%
rename from view/pl/hstrings.php
rename to view/lang/pl/hstrings.php
diff --git a/view/pl/htconfig.tpl b/view/lang/pl/htconfig.tpl
similarity index 100%
rename from view/pl/htconfig.tpl
rename to view/lang/pl/htconfig.tpl
diff --git a/view/pl/invite.casual.subject.tpl b/view/lang/pl/invite.casual.subject.tpl
similarity index 100%
rename from view/pl/invite.casual.subject.tpl
rename to view/lang/pl/invite.casual.subject.tpl
diff --git a/view/pl/invite.casual.tpl b/view/lang/pl/invite.casual.tpl
similarity index 100%
rename from view/pl/invite.casual.tpl
rename to view/lang/pl/invite.casual.tpl
diff --git a/view/pl/invite.formal.subject.tpl b/view/lang/pl/invite.formal.subject.tpl
similarity index 100%
rename from view/pl/invite.formal.subject.tpl
rename to view/lang/pl/invite.formal.subject.tpl
diff --git a/view/pl/invite.formal.tpl b/view/lang/pl/invite.formal.tpl
similarity index 100%
rename from view/pl/invite.formal.tpl
rename to view/lang/pl/invite.formal.tpl
diff --git a/view/pl/invite.material.subject.tpl b/view/lang/pl/invite.material.subject.tpl
similarity index 100%
rename from view/pl/invite.material.subject.tpl
rename to view/lang/pl/invite.material.subject.tpl
diff --git a/view/pl/invite.material.tpl b/view/lang/pl/invite.material.tpl
similarity index 100%
rename from view/pl/invite.material.tpl
rename to view/lang/pl/invite.material.tpl
diff --git a/view/pl/lostpass_eml.tpl b/view/lang/pl/lostpass_eml.tpl
similarity index 100%
rename from view/pl/lostpass_eml.tpl
rename to view/lang/pl/lostpass_eml.tpl
diff --git a/view/pl/passchanged_eml.tpl b/view/lang/pl/passchanged_eml.tpl
similarity index 100%
rename from view/pl/passchanged_eml.tpl
rename to view/lang/pl/passchanged_eml.tpl
diff --git a/view/pl/register_open_eml.tpl b/view/lang/pl/register_open_eml.tpl
similarity index 100%
rename from view/pl/register_open_eml.tpl
rename to view/lang/pl/register_open_eml.tpl
diff --git a/view/pl/register_verify_eml.tpl b/view/lang/pl/register_verify_eml.tpl
similarity index 100%
rename from view/pl/register_verify_eml.tpl
rename to view/lang/pl/register_verify_eml.tpl
diff --git a/view/pl/register_verify_member.tpl b/view/lang/pl/register_verify_member.tpl
similarity index 100%
rename from view/pl/register_verify_member.tpl
rename to view/lang/pl/register_verify_member.tpl
diff --git a/view/pl/update_fail_eml.tpl b/view/lang/pl/update_fail_eml.tpl
similarity index 100%
rename from view/pl/update_fail_eml.tpl
rename to view/lang/pl/update_fail_eml.tpl
diff --git a/view/pt-br/hmessages.po b/view/lang/pt-br/hmessages.po
similarity index 100%
rename from view/pt-br/hmessages.po
rename to view/lang/pt-br/hmessages.po
diff --git a/view/pt-br/hstrings.php b/view/lang/pt-br/hstrings.php
similarity index 100%
rename from view/pt-br/hstrings.php
rename to view/lang/pt-br/hstrings.php
diff --git a/view/pt-br/lostpass_eml.tpl b/view/lang/pt-br/lostpass_eml.tpl
similarity index 100%
rename from view/pt-br/lostpass_eml.tpl
rename to view/lang/pt-br/lostpass_eml.tpl
diff --git a/view/pt-br/messages.po b/view/lang/pt-br/messages.po
similarity index 100%
rename from view/pt-br/messages.po
rename to view/lang/pt-br/messages.po
diff --git a/view/pt-br/passchanged_eml.tpl b/view/lang/pt-br/passchanged_eml.tpl
similarity index 100%
rename from view/pt-br/passchanged_eml.tpl
rename to view/lang/pt-br/passchanged_eml.tpl
diff --git a/view/pt-br/register_open_eml.tpl b/view/lang/pt-br/register_open_eml.tpl
similarity index 100%
rename from view/pt-br/register_open_eml.tpl
rename to view/lang/pt-br/register_open_eml.tpl
diff --git a/view/pt-br/register_verify_eml.tpl b/view/lang/pt-br/register_verify_eml.tpl
similarity index 100%
rename from view/pt-br/register_verify_eml.tpl
rename to view/lang/pt-br/register_verify_eml.tpl
diff --git a/view/pt-br/strings.php b/view/lang/pt-br/strings.php
similarity index 100%
rename from view/pt-br/strings.php
rename to view/lang/pt-br/strings.php
diff --git a/view/pt-br/update_fail_eml.tpl b/view/lang/pt-br/update_fail_eml.tpl
similarity index 100%
rename from view/pt-br/update_fail_eml.tpl
rename to view/lang/pt-br/update_fail_eml.tpl
diff --git a/view/ru/hmessages.po b/view/lang/ru/hmessages.po
similarity index 100%
rename from view/ru/hmessages.po
rename to view/lang/ru/hmessages.po
diff --git a/view/ru/hstrings.php b/view/lang/ru/hstrings.php
similarity index 100%
rename from view/ru/hstrings.php
rename to view/lang/ru/hstrings.php
diff --git a/view/ru/hubzilla_update_fail_eml.tpl b/view/lang/ru/hubzilla_update_fail_eml.tpl
similarity index 100%
rename from view/ru/hubzilla_update_fail_eml.tpl
rename to view/lang/ru/hubzilla_update_fail_eml.tpl
diff --git a/view/ru/invite.casual.subject.tpl b/view/lang/ru/invite.casual.subject.tpl
similarity index 100%
rename from view/ru/invite.casual.subject.tpl
rename to view/lang/ru/invite.casual.subject.tpl
diff --git a/view/ru/invite.casual.tpl b/view/lang/ru/invite.casual.tpl
similarity index 100%
rename from view/ru/invite.casual.tpl
rename to view/lang/ru/invite.casual.tpl
diff --git a/view/ru/invite.formal.subject.tpl b/view/lang/ru/invite.formal.subject.tpl
similarity index 100%
rename from view/ru/invite.formal.subject.tpl
rename to view/lang/ru/invite.formal.subject.tpl
diff --git a/view/ru/invite.formal.tpl b/view/lang/ru/invite.formal.tpl
similarity index 100%
rename from view/ru/invite.formal.tpl
rename to view/lang/ru/invite.formal.tpl
diff --git a/view/ru/invite.material.subject.tpl b/view/lang/ru/invite.material.subject.tpl
similarity index 100%
rename from view/ru/invite.material.subject.tpl
rename to view/lang/ru/invite.material.subject.tpl
diff --git a/view/ru/invite.material.tpl b/view/lang/ru/invite.material.tpl
similarity index 100%
rename from view/ru/invite.material.tpl
rename to view/lang/ru/invite.material.tpl
diff --git a/view/ru/lostpass_eml.tpl b/view/lang/ru/lostpass_eml.tpl
similarity index 100%
rename from view/ru/lostpass_eml.tpl
rename to view/lang/ru/lostpass_eml.tpl
diff --git a/view/ru/messages.po b/view/lang/ru/messages.po
similarity index 100%
rename from view/ru/messages.po
rename to view/lang/ru/messages.po
diff --git a/view/ru/passchanged_eml.tpl b/view/lang/ru/passchanged_eml.tpl
similarity index 100%
rename from view/ru/passchanged_eml.tpl
rename to view/lang/ru/passchanged_eml.tpl
diff --git a/view/ru/register_open_eml.tpl b/view/lang/ru/register_open_eml.tpl
similarity index 100%
rename from view/ru/register_open_eml.tpl
rename to view/lang/ru/register_open_eml.tpl
diff --git a/view/ru/register_verify_eml.tpl b/view/lang/ru/register_verify_eml.tpl
similarity index 100%
rename from view/ru/register_verify_eml.tpl
rename to view/lang/ru/register_verify_eml.tpl
diff --git a/view/ru/register_verify_member.tpl b/view/lang/ru/register_verify_member.tpl
similarity index 100%
rename from view/ru/register_verify_member.tpl
rename to view/lang/ru/register_verify_member.tpl
diff --git a/view/ru/strings.php b/view/lang/ru/strings.php
similarity index 100%
rename from view/ru/strings.php
rename to view/lang/ru/strings.php
diff --git a/view/ru/update_fail_eml.tpl b/view/lang/ru/update_fail_eml.tpl
similarity index 100%
rename from view/ru/update_fail_eml.tpl
rename to view/lang/ru/update_fail_eml.tpl
diff --git a/view/sv/hmessages.po b/view/lang/sv/hmessages.po
similarity index 100%
rename from view/sv/hmessages.po
rename to view/lang/sv/hmessages.po
diff --git a/view/sv/hstrings.php b/view/lang/sv/hstrings.php
similarity index 100%
rename from view/sv/hstrings.php
rename to view/lang/sv/hstrings.php
diff --git a/view/sv/lostpass_eml.tpl b/view/lang/sv/lostpass_eml.tpl
similarity index 100%
rename from view/sv/lostpass_eml.tpl
rename to view/lang/sv/lostpass_eml.tpl
diff --git a/view/sv/messages.po b/view/lang/sv/messages.po
similarity index 100%
rename from view/sv/messages.po
rename to view/lang/sv/messages.po
diff --git a/view/sv/passchanged_eml.tpl b/view/lang/sv/passchanged_eml.tpl
similarity index 100%
rename from view/sv/passchanged_eml.tpl
rename to view/lang/sv/passchanged_eml.tpl
diff --git a/view/sv/register_open_eml.tpl b/view/lang/sv/register_open_eml.tpl
similarity index 100%
rename from view/sv/register_open_eml.tpl
rename to view/lang/sv/register_open_eml.tpl
diff --git a/view/sv/register_verify_eml.tpl b/view/lang/sv/register_verify_eml.tpl
similarity index 100%
rename from view/sv/register_verify_eml.tpl
rename to view/lang/sv/register_verify_eml.tpl
diff --git a/view/sv/register_verify_member.tpl b/view/lang/sv/register_verify_member.tpl
similarity index 100%
rename from view/sv/register_verify_member.tpl
rename to view/lang/sv/register_verify_member.tpl
diff --git a/view/sv/strings.php b/view/lang/sv/strings.php
similarity index 100%
rename from view/sv/strings.php
rename to view/lang/sv/strings.php
diff --git a/view/sv/update_fail_eml.tpl b/view/lang/sv/update_fail_eml.tpl
similarity index 100%
rename from view/sv/update_fail_eml.tpl
rename to view/lang/sv/update_fail_eml.tpl