diff --git a/Application/translations/de/d3totp_lang.php b/Application/translations/de/d3totp_lang.php
new file mode 100644
index 0000000..1c8b142
--- /dev/null
+++ b/Application/translations/de/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'Deutsch';
+
+$aLang = include __DIR__."/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/translations/de/d3_totp_lang.php b/Application/translations/de/translations.php
similarity index 100%
rename from Application/translations/de/d3_totp_lang.php
rename to Application/translations/de/translations.php
diff --git a/Application/translations/en/d3totp_lang.php b/Application/translations/en/d3totp_lang.php
new file mode 100644
index 0000000..e092617
--- /dev/null
+++ b/Application/translations/en/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'English';
+
+$aLang = include __DIR__."/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/translations/en/d3_totp_lang.php b/Application/translations/en/translations.php
similarity index 100%
rename from Application/translations/en/d3_totp_lang.php
rename to Application/translations/en/translations.php
diff --git a/Application/views/admin_smarty/de/d3totp_lang.php b/Application/views/admin_smarty/de/d3totp_lang.php
new file mode 100644
index 0000000..f7fb601
--- /dev/null
+++ b/Application/views/admin_smarty/de/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'Deutsch';
+
+$aLang = include __DIR__."/../../de/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/views/admin_smarty/en/d3totp_lang.php b/Application/views/admin_smarty/en/d3totp_lang.php
new file mode 100644
index 0000000..0508c4d
--- /dev/null
+++ b/Application/views/admin_smarty/en/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'English';
+
+$aLang = include __DIR__."/../../en/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/views/admin_twig/de/d3totp_lang.php b/Application/views/admin_twig/de/d3totp_lang.php
new file mode 100644
index 0000000..f7fb601
--- /dev/null
+++ b/Application/views/admin_twig/de/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'Deutsch';
+
+$aLang = include __DIR__."/../../de/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/views/admin_twig/en/d3totp_lang.php b/Application/views/admin_twig/en/d3totp_lang.php
new file mode 100644
index 0000000..0508c4d
--- /dev/null
+++ b/Application/views/admin_twig/en/d3totp_lang.php
@@ -0,0 +1,22 @@
+<?php
+
+/**
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ *
+ * https://www.d3data.de
+ *
+ * @copyright (C) D3 Data Development (Inh. Thomas Dartsch)
+ * @author    D3 Data Development - Daniel Seifert <info@shopmodule.com>
+ * @link      https://www.oxidmodule.com
+ */
+
+declare(strict_types=1);
+
+// @codeCoverageIgnoreStart
+
+$sLangName = 'English';
+
+$aLang = include __DIR__."/../../en/translations.php";
+
+// @codeCoverageIgnoreEnd
diff --git a/Application/views/admin/de/d3totp_lang.php b/Application/views/de/translations.php
similarity index 100%
rename from Application/views/admin/de/d3totp_lang.php
rename to Application/views/de/translations.php
diff --git a/Application/views/admin/en/d3totp_lang.php b/Application/views/en/translations.php
similarity index 100%
rename from Application/views/admin/en/d3totp_lang.php
rename to Application/views/en/translations.php
diff --git a/metadata.php b/metadata.php
old mode 100755
new mode 100644
diff --git a/phpunuhi.xml b/phpunuhi.xml
new file mode 100644
index 0000000..3a83614
--- /dev/null
+++ b/phpunuhi.xml
@@ -0,0 +1,25 @@
+<phpunuhi
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:noNamespaceSchemaLocation="../../boxblinkracer/phpunuhi/config.xsd"
+>
+    <translations>
+        <set name="Frontend">
+            <format>
+                <php/>
+            </format>
+            <locales>
+                <locale name="de">./Application/translations/%locale_lc%/translations.php</locale>
+                <locale name="en">./Application/translations/%locale_lc%/translations.php</locale>
+            </locales>
+        </set>
+        <set name="Backend">
+            <format>
+                <php/>
+            </format>
+            <locales>
+                <locale name="de">./Application/views/%locale_lc%/translations.php</locale>
+                <locale name="en">./Application/views/%locale_lc%/translations.php</locale>
+            </locales>
+        </set>
+    </translations>
+</phpunuhi>
diff --git a/Application/views/admin/blocks/d3totp_login_admin_login_form.tpl b/views/smarty/admin/blocks/d3totp_login_admin_login_form.tpl
similarity index 100%
rename from Application/views/admin/blocks/d3totp_login_admin_login_form.tpl
rename to views/smarty/admin/blocks/d3totp_login_admin_login_form.tpl
diff --git a/Application/views/admin/tpl/d3totplogin.tpl b/views/smarty/admin/tpl/d3totplogin.tpl
similarity index 100%
rename from Application/views/admin/tpl/d3totplogin.tpl
rename to views/smarty/admin/tpl/d3totplogin.tpl
diff --git a/Application/views/admin/tpl/d3user_totp.tpl b/views/smarty/admin/tpl/d3user_totp.tpl
similarity index 100%
rename from Application/views/admin/tpl/d3user_totp.tpl
rename to views/smarty/admin/tpl/d3user_totp.tpl
diff --git a/Application/views/blocks/page/account/account_dashboard_col2_flow.tpl b/views/smarty/blocks/page/account/account_dashboard_col2_flow.tpl
similarity index 100%
rename from Application/views/blocks/page/account/account_dashboard_col2_flow.tpl
rename to views/smarty/blocks/page/account/account_dashboard_col2_flow.tpl
diff --git a/Application/views/blocks/page/account/account_dashboard_col2_wave.tpl b/views/smarty/blocks/page/account/account_dashboard_col2_wave.tpl
similarity index 100%
rename from Application/views/blocks/page/account/account_dashboard_col2_wave.tpl
rename to views/smarty/blocks/page/account/account_dashboard_col2_wave.tpl
diff --git a/Application/views/blocks/page/account/inc/account_menu.tpl b/views/smarty/blocks/page/account/inc/account_menu.tpl
similarity index 100%
rename from Application/views/blocks/page/account/inc/account_menu.tpl
rename to views/smarty/blocks/page/account/inc/account_menu.tpl
diff --git a/Application/views/blocks/widget/header/widget_header_servicebox_items.tpl b/views/smarty/blocks/widget/header/widget_header_servicebox_items.tpl
similarity index 100%
rename from Application/views/blocks/widget/header/widget_header_servicebox_items.tpl
rename to views/smarty/blocks/widget/header/widget_header_servicebox_items.tpl
diff --git a/Application/views/tpl/d3_account_totp.tpl b/views/smarty/wave/d3_account_totp.tpl
similarity index 100%
rename from Application/views/tpl/d3_account_totp.tpl
rename to views/smarty/wave/d3_account_totp.tpl
diff --git a/Application/views/tpl/d3totplogin.tpl b/views/smarty/wave/d3totplogin.tpl
similarity index 100%
rename from Application/views/tpl/d3totplogin.tpl
rename to views/smarty/wave/d3totplogin.tpl