diff --git a/views/twig/wave/d3_account_totp.html.twig b/views/twig/apex/d3_account_totp.html.twig
similarity index 100%
rename from views/twig/wave/d3_account_totp.html.twig
rename to views/twig/apex/d3_account_totp.html.twig
diff --git a/views/twig/wave/d3_account_totp.tpl b/views/twig/apex/d3_account_totp.tpl
similarity index 100%
rename from views/twig/wave/d3_account_totp.tpl
rename to views/twig/apex/d3_account_totp.tpl
diff --git a/views/twig/wave/d3totpadminlogin.html.twig b/views/twig/apex/d3totpadminlogin.html.twig
similarity index 100%
rename from views/twig/wave/d3totpadminlogin.html.twig
rename to views/twig/apex/d3totpadminlogin.html.twig
diff --git a/views/twig/wave/d3totplogin.tpl b/views/twig/apex/d3totplogin.tpl
similarity index 100%
rename from views/twig/wave/d3totplogin.tpl
rename to views/twig/apex/d3totplogin.tpl
diff --git a/views/twig/extensions/admin/d3totp_login_admin_login_form.html.twig b/views/twig/extensions/themes/admin_twig/d3totp_login_admin_login_form.html.twig
similarity index 100%
rename from views/twig/extensions/admin/d3totp_login_admin_login_form.html.twig
rename to views/twig/extensions/themes/admin_twig/d3totp_login_admin_login_form.html.twig
diff --git a/views/twig/extensions/admin/d3totp_login_admin_login_form.tpl b/views/twig/extensions/themes/admin_twig/d3totp_login_admin_login_form.tpl
similarity index 100%
rename from views/twig/extensions/admin/d3totp_login_admin_login_form.tpl
rename to views/twig/extensions/themes/admin_twig/d3totp_login_admin_login_form.tpl
diff --git a/views/twig/extensions/wave/page/account/account_dashboard_col2_wave.html.twig b/views/twig/extensions/themes/default/page/account/dashboard.html.twig
similarity index 100%
rename from views/twig/extensions/wave/page/account/account_dashboard_col2_wave.html.twig
rename to views/twig/extensions/themes/default/page/account/dashboard.html.twig
diff --git a/views/twig/extensions/wave/page/account/inc/account_menu.html.twig b/views/twig/extensions/themes/default/page/account/inc/account_menu.html.twig
similarity index 100%
rename from views/twig/extensions/wave/page/account/inc/account_menu.html.twig
rename to views/twig/extensions/themes/default/page/account/inc/account_menu.html.twig
diff --git a/views/twig/extensions/wave/widget/header/widget_header_servicebox_items.html.twig b/views/twig/extensions/themes/default/widget/header/widget_header_servicebox_items.html.twig
similarity index 100%
rename from views/twig/extensions/wave/widget/header/widget_header_servicebox_items.html.twig
rename to views/twig/extensions/themes/default/widget/header/widget_header_servicebox_items.html.twig
diff --git a/views/twig/extensions/wave/widget/header/widget_header_servicebox_items.tpl b/views/twig/extensions/themes/default/widget/header/widget_header_servicebox_items.tpl
similarity index 100%
rename from views/twig/extensions/wave/widget/header/widget_header_servicebox_items.tpl
rename to views/twig/extensions/themes/default/widget/header/widget_header_servicebox_items.tpl
diff --git a/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.html.twig b/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.html.twig
deleted file mode 100644
index f647bba..0000000
--- a/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.html.twig
+++ /dev/null
@@ -1,11 +0,0 @@
-{{ parent() }}
-
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <a href="{{ seo_url({ ident: oViewConf.getSelfLink()|cat("cl=d3_account_totp") }) }}">{{ translate({ ident: "D3_TOTP_ACCOUNT" }) }}</a>
-        <a href="{{ seo_url({ ident: oViewConf.getSslSelfLink()|cat("cl=d3_account_totp") }) }}" class="btn btn-default btn-xs pull-right">
-            <i class="fa fa-arrow-right"></i>
-        </a>
-    </div>
-    <div class="panel-body">{{ translate({ ident: "D3_TOTP_ACCOUNT_DESC" }) }}</div>
-</div>
\ No newline at end of file
diff --git a/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.tpl b/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.tpl
deleted file mode 100644
index 8084fde..0000000
--- a/views/twig/extensions/wave/page/account/account_dashboard_col2_flow.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-[{$smarty.block.parent}]
-
-<div class="panel panel-default">
-    <div class="panel-heading">
-        <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=d3_account_totp"}]">[{oxmultilang ident="D3_TOTP_ACCOUNT"}]</a>
-        <a href="[{oxgetseourl ident=$oViewConf->getSslSelfLink()|cat:"cl=d3_account_totp"}]" class="btn btn-default btn-xs pull-right">
-            <i class="fa fa-arrow-right"></i>
-        </a>
-    </div>
-    <div class="panel-body">[{oxmultilang ident="D3_TOTP_ACCOUNT_DESC"}]</div>
-</div>
\ No newline at end of file
diff --git a/views/twig/extensions/wave/page/account/account_dashboard_col2_wave.tpl b/views/twig/extensions/wave/page/account/account_dashboard_col2_wave.tpl
deleted file mode 100644
index 15bed23..0000000
--- a/views/twig/extensions/wave/page/account/account_dashboard_col2_wave.tpl
+++ /dev/null
@@ -1,11 +0,0 @@
-[{$smarty.block.parent}]
-
-<div class="card">
-    <div class="card-header">
-        <a href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=d3_account_totp"}]">[{oxmultilang ident="D3_TOTP_ACCOUNT"}]</a>
-        <a href="[{oxgetseourl ident=$oViewConf->getSslSelfLink()|cat:"cl=d3_account_totp"}]" class="btn btn-outline-dark btn-sm float-right edit-button">
-            <i class="fa fa-arrow-right"></i>
-        </a>
-    </div>
-    <div class="card-body">[{oxmultilang ident="D3_TOTP_ACCOUNT_DESC"}]</div>
-</div>
\ No newline at end of file
diff --git a/views/twig/extensions/wave/page/account/inc/account_menu.tpl b/views/twig/extensions/wave/page/account/inc/account_menu.tpl
deleted file mode 100644
index deaa83b..0000000
--- a/views/twig/extensions/wave/page/account/inc/account_menu.tpl
+++ /dev/null
@@ -1,4 +0,0 @@
-[{$smarty.block.parent}]
-<li class="list-group-item[{if $active_link == "d3totp"}] active[{/if}]">
-    <a class="[{* wave *}] list-group-link" href="[{oxgetseourl ident=$oViewConf->getSelfLink()|cat:"cl=d3_account_totp"}]" title="[{oxmultilang ident="D3_TOTP_ACCOUNT"}]">[{oxmultilang ident="D3_TOTP_ACCOUNT"}]</a>
-</li>
\ No newline at end of file