diff --git a/Application/Extend/.ide-helper.php b/Application/Extend/.ide-helper.php
new file mode 100644
index 0000000..75eb3c4
--- /dev/null
+++ b/Application/Extend/.ide-helper.php
@@ -0,0 +1,5 @@
+<?php
+
+namespace VanillaThunder\GoogleTagManager\Application\Extend;
+
+class ViewConfig_parent extends \OxidEsales\Eshop\Core\ViewConfig {};
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/extend/oxviewconf_blatm.php b/Application/Extend/ViewConfig.php
similarity index 52%
rename from copy_this/modules/bla/tag-manager/application/extend/oxviewconf_blatm.php
rename to Application/Extend/ViewConfig.php
index f73a23b..f9cb0f7 100644
--- a/copy_this/modules/bla/tag-manager/application/extend/oxviewconf_blatm.php
+++ b/Application/Extend/ViewConfig.php
@@ -1,81 +1,60 @@
 <?php
 
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
+/*
+ * vanilla-thunder/oxid-module-gtm
+ * Google Tag Manager Integration for OXID eShop v6.2+
  *
  * This program is free software;
  * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
  * either version 3 of the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
  * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
+ */
 
-class oxviewconf_blatm extends oxviewconf_blatm_parent
+namespace VanillaThunder\GoogleTagManager\Application\Extend;
+
+use OxidEsales\Eshop\Application\Controller\FrontendController;
+use OxidEsales\Eshop\Core\Registry;
+use OxidEsales\EshopCommunity\Internal\Container\ContainerFactory;
+use OxidEsales\EshopCommunity\Internal\Framework\Module\Configuration\Bridge\ModuleSettingBridgeInterface;
+
+class ViewConfig extends ViewConfig_parent
 {
 
-    // google tag manager stuff
-    private $_sBlaGTMid = null;
-    public function getGTMid()
+    // Google Tag Manager Container ID
+    private $sContainerId = null;
+    public function getGtmContainerId()
     {
-        if ( $this->_sBlaGTMid === null ) $this->_sBlaGTMid = oxRegistry::getConfig()->getConfigParam("bla_gtm_id");
-        return $this->_sBlaGTMid;
-    }
-    
-    private $_productlistcategories;
-    public function getGTMproductListPerformanceSetting()
-    {
-        if ( $this->_productlistcategories === null ) $this->_productlistcategories = oxRegistry::getConfig()->getConfigParam("bla_tm_productlistcategories");
-        return $this->_productlistcategories;
-    }
-    
-    // matomo tag manager id
-    private $_sBlaMTMid = null;
-    public function getMTMid()
-    {
-        if ( $this->_sBlaMTMid === null ) $this->_sBlaMTMid = oxRegistry::getConfig()->getConfigParam("bla_mtm_id");
-        return $this->_sBlaMTMid;
-    }
-    
-    // yandex metrica id
-    private $_sBlaYMid = null;
-    public function getYMid()
-    {
-        if ( $this->_sBlaYMid === null ) $this->_sBlaYMid = oxRegistry::getConfig()->getConfigParam("bla_ym_id");
-        return $this->_sBlaYMid;
+        if ( $this->sContainerId === null ) {
+            $this->sContainerId = ContainerFactory::getInstance()
+                ->getContainer()
+                ->get(ModuleSettingBridgeInterface::class)
+                ->get('vt_gtm_containerid', 'vt-gtm');
+        }
+        return $this->sContainerId;
     }
 
-    private $_blTagmanagerEnabled = null;
-    public function isTagmanagerEnabled()
-	{
-		if ( $this->_blTagmanagerEnabled === null ) $this->_blTagmanagerEnabled = (bool) $this->getGTMid() || $this->getMTMid() || $this->getYMid();
-		return $this->_blTagmanagerEnabled;
-	}
 
-    public function getDataLayer()
+
+    public function getGtmDataLayer()
     {
-    	if( !$this->isTagmanagerEnabled() ) return false;
+    	if( !$this->getGtmContainerId() ) return "[]";
 
-        $oConfig = oxRegistry::getConfig(); /** @var oxConfig $oConfig */
-        $oView = $oConfig->getActiveView(); /** @var oxUbase $oShop */
+        $oConfig = Registry::getConfig();
+        $oView = $oConfig->getTopActiveView(); /** @var FrontendController $oShop */
         //$oShop = oxRegistry::getConfig()->getActiveShop(); /** @var oxShop $oShop */
         $oUser = $oConfig->getUser();
 
         $dataLayer = [
-            'user' => array_merge(
-                ['country' => ($oUser ? $oUser->getUserCountry() : 'unknown')],
-                (oxRegistry::getSession()->getVariable("bla_refs") ? oxRegistry::getSession()->getVariable("bla_refs") : [])
-            ),
-            'page' => [
-                "type" => "default",
-                "class"=> $oView->getClassName(),
-                "title" => (class_exists("matomo") ? oxRegistry::get("matomo")->getDocumentTitle($oView) : $oView->getTitle() )
-            ]
+            'page_title' => $oView->getTitle(),
+            'controller' => $this->getTopActionClassName(),
+            'user' => ( $oUser ? "true" : "false" )
         ];
 
+        return json_encode([$dataLayer],JSON_PRETTY_PRINT);
+
         unset($dataLayer["user"]["http"]); // das brauchen wir hier nicht
 
         $cl = $this->getActiveClassName();
@@ -108,4 +87,11 @@ class oxviewconf_blatm extends oxviewconf_blatm_parent
         */
     }
 
+    public function isPromotionList($listId)
+    {
+        $oConfig = Registry::getConfig();
+        $aPromotionListIds = $oConfig->getConfigParam("") ?? [ 'bargainItems', 'newItems', 'topBox', 'alsoBought', 'accessories', 'cross' ];
+
+
+    }
 }
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/translations/de/blagtm_lang.php b/Application/translations/de/module_lang.php
similarity index 59%
rename from copy_this/modules/bla/tag-manager/application/translations/de/blagtm_lang.php
rename to Application/translations/de/module_lang.php
index 01fae7b..ed0a7ab 100644
--- a/copy_this/modules/bla/tag-manager/application/translations/de/blagtm_lang.php
+++ b/Application/translations/de/module_lang.php
@@ -18,22 +18,22 @@ $aLang = [
 
 	// das hier wird nicht mehr benötigt, aber ich lasse es drin, falls doch
 	// leserliche Namen für product list performance (GA)
-	'BLA_GTM_EE_productList'  => 'Kategorie',
-	'BLA_GTM_EE_categoryList' => 'Kategorie',
-	'BLA_GTM_EE_searchList'   => 'Suchergebnisse',
-	'BLA_GTM_EE_cross'        => 'Crossselling',
-	'BLA_GTM_EE_accessories'  => 'Zubehör',
-	'BLA_GTM_EE_alsoBought'   => 'Kunden kaufen auch',
-	'BLA_GTM_EE_last'         => 'Zuletzt angesehen',
-	'BLA_GTM_EE_bargainItems' => 'Angebot der Woche',
-	'BLA_GTM_EE_newItems'     => 'Frisch eingetroffen',
-	'BLA_GTM_EE_topBox'       => 'Topseller',
+	'VT_GTM_EE_productList'  => 'Kategorie',
+	'VT_GTM_EE_categoryList' => 'Kategorie',
+	'VT_GTM_EE_searchList'   => 'Suchergebnisse',
+	'VT_GTM_EE_cross'        => 'Crossselling',
+	'VT_GTM_EE_accessories'  => 'Zubehör',
+	'VT_GTM_EE_alsoBought'   => 'Kunden kaufen auch',
+	'VT_GTM_EE_last'         => 'Zuletzt angesehen',
+	'VT_GTM_EE_bargainItems' => 'Angebot der Woche',
+	'VT_GTM_EE_newItems'     => 'Frisch eingetroffen',
+	'VT_GTM_EE_topBox'       => 'Topseller',
 	// ab hier wird wieder benötigt
 
 	// Dimensionen im checkout
-	'BLA_GTM_EE_LOGINOPTION'  => 'Bestandskunde',
-	'BLA_GTM_EE_LOGINOPTION1' => 'Gastbestellung',
-	'BLA_GTM_EE_LOGINOPTION2' => 'Bestandskunde',
-	'BLA_GTM_EE_LOGINOPTION3' => 'Neukunde'
+	'VT_GTM_EE_LOGINOPTION'  => 'Bestandskunde',
+	'VT_GTM_EE_LOGINOPTION1' => 'Gastbestellung',
+	'VT_GTM_EE_LOGINOPTION2' => 'Bestandskunde',
+	'VT_GTM_EE_LOGINOPTION3' => 'Neukunde'
 
 ];
diff --git a/copy_this/modules/bla/tag-manager/application/translations/en/blagtm_lang.php b/Application/translations/en/blagtm_lang.php
similarity index 64%
rename from copy_this/modules/bla/tag-manager/application/translations/en/blagtm_lang.php
rename to Application/translations/en/blagtm_lang.php
index d1ee513..84293dc 100644
--- a/copy_this/modules/bla/tag-manager/application/translations/en/blagtm_lang.php
+++ b/Application/translations/en/blagtm_lang.php
@@ -19,19 +19,19 @@ $aLang = [
 
 	// das hier wird nicht mehr benötigt, aber ich lasse es drin, falls doch
 	// leserliche Namen für product list performance (GA)
-	'BLA_GTM_EE_productList'  => 'Category',
-	'BLA_GTM_EE_searchList'   => 'Search',
-	'BLA_GTM_EE_cross'        => 'Crossselling',
-	'BLA_GTM_EE_accessories'  => 'Accessories',
-	'BLA_GTM_EE_last'         => 'Last Seen',
-	'BLA_GTM_EE_bargainItems' => 'Offer of the Week',
-	'BLA_GTM_EE_newItems'     => 'Just Arrived',
-	'BLA_GTM_EE_topBox'       => 'Topseller',
+	'VT_GTM_EE_productList'  => 'Category',
+	'VT_GTM_EE_searchList'   => 'Search',
+	'VT_GTM_EE_cross'        => 'Crossselling',
+	'VT_GTM_EE_accessories'  => 'Accessories',
+	'VT_GTM_EE_last'         => 'Last Seen',
+	'VT_GTM_EE_bargainItems' => 'Offer of the Week',
+	'VT_GTM_EE_newItems'     => 'Just Arrived',
+	'VT_GTM_EE_topBox'       => 'Topseller',
 	// ab hier wird wieder benötigt
 
 	// Dimensionen im checkout
-	'BLA_GTM_EE_LOGINOPTION'  => 'Existing Customer',
-	'BLA_GTM_EE_LOGINOPTION1' => 'Guest',
-	'BLA_GTM_EE_LOGINOPTION2' => 'Existing Customer',
-	'BLA_GTM_EE_LOGINOPTION3' => 'New Customer'
+	'VT_GTM_EE_LOGINOPTION'  => 'Existing Customer',
+	'VT_GTM_EE_LOGINOPTION1' => 'Guest',
+	'VT_GTM_EE_LOGINOPTION2' => 'Existing Customer',
+	'VT_GTM_EE_LOGINOPTION3' => 'New Customer'
 ];
diff --git a/Application/views/admin/de/module_options.php b/Application/views/admin/de/module_options.php
new file mode 100644
index 0000000..bb0a054
--- /dev/null
+++ b/Application/views/admin/de/module_options.php
@@ -0,0 +1,31 @@
+<?php
+
+/*
+ * vanilla-thunder/oxid-module-gtm
+ * Google Tag Manager Integration for OXID eShop v6.2+
+ *
+ * This program is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ *  without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ */
+
+$style = '<style type="text/css">
+.groupExp a.rc b {font-size:medium;color:#ff3600;}
+.groupExp dt .txt,
+.groupExp dt .select,
+ .groupExp dt .txtfield {width:250px !important; margin: 2px !important; padding: 1px 4px !important; border: 1px solid #ccc !important; }
+.groupExp dt textarea.txtfield { min-height: 125px;}
+.groupExp dl { display:block !important;}
+input.confinput {position:fixed;top:20px;right:70px;background:#008B2D;padding:10px 25px;color:white;border:1px solid black;cursor:pointer;font-size:125%;}
+input.confinput:hover {outline:3px solid #ff3600;}
+</style>';
+$aLang = [
+    'charset'                             => 'UTF-8',
+    'SHOP_MODULE_GROUP_vt_gtm_settings'   => $style . 'Einstellungen',
+    'SHOP_MODULE_vt_gtm_containerid'      => 'Container ID',
+    'SHOP_MODULE_vt_gtm_promotionlistids' => 'Promotion Produktlisten IDs <div>Weitere Infos zu dieser Einstellung: <b><u><a href="https://github.com/vanilla-thunder/oxid-module-gtm/wiki/Promotion-Produktlisten" target="_blank">Modui-Wiki</a></u></b></div>',
+];
diff --git a/Application/views/blocks/_gtm_js.tpl b/Application/views/blocks/_gtm_js.tpl
new file mode 100644
index 0000000..46e65c2
--- /dev/null
+++ b/Application/views/blocks/_gtm_js.tpl
@@ -0,0 +1,24 @@
+[{if $oViewConf->getGtmContainerId()}][{strip}]
+    <!-- Google Tag Manager -->
+    <script>
+        var dataLayer = [{$oViewConf->getGtmDataLayer()}] || [];
+        (function (w, d, s, l, i) {
+            w[l] = w[l] || [];
+            w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
+            var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
+            j.async = true;
+            j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
+            f.parentNode.insertBefore(j, f);
+        })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGtmContainerId()}]');
+    </script>
+    <!-- End Google Tag Manager -->
+    [{if $oViewConf->getTopActionClassName() === "alist" }]
+        [{* include file="ga4_view_item_list.tpl" gtmCategory=$oView->getActiveCategory() gtmProducts=$oView->getArticleList() listtype=$oView->getListType() *}]
+    [{elseif $oViewConf->getTopActionClassName() === "details" }]
+        [{* include file="ga4_view_item.tpl" gtmProduct=$oView->getProduct() *}]
+    [{elseif $oViewConf->getTopActionClassName() === "search" }]
+    [{elseif $oViewConf->getTopActionClassName() === "basket" }]
+
+    [{/if}]
+[{/strip}][{/if}]
+[{$smarty.block.parent}]
diff --git a/Application/views/blocks/_gtm_nojs.tpl b/Application/views/blocks/_gtm_nojs.tpl
new file mode 100644
index 0000000..fa191b0
--- /dev/null
+++ b/Application/views/blocks/_gtm_nojs.tpl
@@ -0,0 +1,8 @@
+[{if $oViewConf->getGtmContainerId()}][{strip}]
+    <!-- Google Tag Manager (noscript) -->
+    <noscript>
+        <iframe src="https://www.googletagmanager.com/ns.html?id=[{$oViewConf->getGtmContainerId()}]"
+                height="0" width="0" style="display:none;visibility:hidden"></iframe>
+    </noscript>
+    <!-- End Google Tag Manager (noscript) -->[{/strip}][{/if}]
+[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/Application/views/blocks/_impression.tpl b/Application/views/blocks/_impression.tpl
new file mode 100644
index 0000000..362f469
--- /dev/null
+++ b/Application/views/blocks/_impression.tpl
@@ -0,0 +1,66 @@
+[{$smarty.block.parent}]
+[{*
+[{strip}]
+    [{assign var="gtmProduct" value=$oView->getProduct()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+
+    [{if !$head }]
+        [{assign var=$head value=$oView->getViewParameter('head')}]
+    [{/if}]
+    <script>
+        var gtmItem = {
+            'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+            'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+
+            'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+            'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+
+            'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+            'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+
+            'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+            'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+
+            'price': [{$gtmProduct->oxarticles__oxprice->value}],
+
+            'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
+            'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
+
+            [{if $listId == 'productList' || $listId == 'categoryList'}]
+                /* category list */
+                'list': '[{$listId}]',
+                'item_list_id': '[{$listId}]',
+                'item_list_name': '[{$head}]',
+            [{elseif $listId}]
+                /* category list */
+                'list': '[{$listId}]',
+                'promotion_id': '[{$listId}]',
+                'promotion_name': '[{$head}]',
+            [{/if}]
+            'position': [{$iIndex}],
+            'index': [{$iIndex}],
+            'quantity': '1'
+        };
+        /* UA */
+        dataLayer.push({ ecommerce: null });
+        dataLayer.push({
+            'event': 'UA_event',
+            'event_name': 'Impression',
+            'ecommerce': {
+                'currencyCode': '[{$currency->name}]',
+                'impressions': [gtmItem]
+            }
+        });
+        /* GA4 */
+        dataLayer.push({ ecommerce: null });
+        dataLayer.push({
+            'event': 'GA4_event',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+                'items': [gtmItem]
+            }
+        });
+    </script>
+[{/strip}]
+*}]
\ No newline at end of file
diff --git a/Application/views/blocks/add_to_cart.tpl b/Application/views/blocks/add_to_cart.tpl
new file mode 100644
index 0000000..0202833
--- /dev/null
+++ b/Application/views/blocks/add_to_cart.tpl
@@ -0,0 +1,5 @@
+[{if $oxcmp_basket->isNewItemAdded() && $smarty.session._newitem}]
+    <!-- [{$smarty.session._newitem|@var_dump}] -->
+    [{* include file="ga4_add_to_cart.tpl" gtmProduct=$smarty.session._newitem *}]
+[{/if}]
+[{$smarty.block.parent}]
diff --git a/Application/views/blocks/checkout_s1.tpl b/Application/views/blocks/checkout_s1.tpl
new file mode 100644
index 0000000..26d293a
--- /dev/null
+++ b/Application/views/blocks/checkout_s1.tpl
@@ -0,0 +1,57 @@
+[{strip}]
+    [{assign var='gtmCartArticles' value=$oView->getBasketArticles()}]
+    <script>
+        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+        dataLayer.push({
+            'event': 'ee.checkout',
+            'eventLabel':'Checkout Step 1',
+            'ecommerce': {
+                'checkout': {
+                    'actionField': {'step': 1},
+                    'products': [
+                        [{foreach from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents  key=basketindex}]
+                        [{assign var='_price' value=$basketitem->getUnitPrice()}]
+                        {
+                            'id': '[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]',
+                            'name': '[{$gtmCartArticles[$basketindex]->oxarticles__oxtitle->value}]',
+                            'variant': '[{$gtmCartArticles[$basketindex]->oxarticles__oxvarselect->value}]',
+                            'price': [{$_price->getPrice()}],
+                            'quantity':[{$basketitem->getAmount()}],
+                            'position':[{$smarty.foreach.gtmCartContents.index}]
+                        }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}]
+                        [{/foreach}]
+                    ]
+                }
+            }
+        });
+        [{*
+        var gtmCartContents = {[{foreach key=basketindex from=$oxcmp_basket->getContents() item=basketitem name=gtmCartContents}]
+            '[{$basketindex}]':{ 'id':'[{$gtmCartArticles[$basketindex]->oxarticles__oxartnum->value}]' }[{if !$smarty.foreach.gtmCartContents.last}],[{/if}][{/foreach}]
+        };
+
+                [{capture name='removeFromBasket'}]
+                $('#basketRemove').on('click', function() {
+                    var _checked = [],
+                        _products = [];
+
+                    $('input:checkbox:checked[name^="aproducts"][name*="remove"]').each(function() { _checked.push($(this).attr('name').replace('aproducts[','').replace('][remove]','')); });
+                    if(_checked.length == 0) return;
+                    _checked.forEach(function(_oxid) { _products.push({ 'id':gtmCartContents[_oxid].id}) });
+
+                    dataLayer.push({
+                        'event':'ee.removeFromCart',
+                        'ecommerce': {
+                            'currencyCode': '[{$currency->name}]',
+                            'remove': {
+                                'products': _products
+                            }
+                        }
+
+                    });
+                });
+                [{/capture }]
+        [{oxscript add=$smarty.capture.removeFromBasket}]
+        *}]
+    </script>
+[{/strip}]
+[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/Application/views/blocks/checkout_s2.tpl b/Application/views/blocks/checkout_s2.tpl
new file mode 100644
index 0000000..dcb7c7d
--- /dev/null
+++ b/Application/views/blocks/checkout_s2.tpl
@@ -0,0 +1,18 @@
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event':'ee.checkout',
+        'eventLabel':'Checkout Step 2',
+        'ecommerce': {
+            'checkout': {
+                'actionField': {
+                    'step': 2,
+                    'option':'[{oxmultilang ident="VT_GTM_EE_LOGINOPTION"|cat:$oView->getLoginOption()}]'
+                }
+            }
+        }
+    });
+</script>
+[{/strip}]
+[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/Application/views/blocks/checkout_s3.tpl b/Application/views/blocks/checkout_s3.tpl
new file mode 100644
index 0000000..701d486
--- /dev/null
+++ b/Application/views/blocks/checkout_s3.tpl
@@ -0,0 +1,9 @@
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'ee.checkout',
+        'eventLabel': 'Checkout Step 3',
+        'ecommerce': {'checkout': {'actionField': {'step': 3}}}
+    });
+</script>
+[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/Application/views/blocks/checkout_s4.tpl b/Application/views/blocks/checkout_s4.tpl
new file mode 100644
index 0000000..108e59d
--- /dev/null
+++ b/Application/views/blocks/checkout_s4.tpl
@@ -0,0 +1,9 @@
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        "event": "ee.checkout",
+        'eventLabel': 'Checkou Step 4',
+        "ecommerce": {"checkout": {"actionField": {"step": 4}}}
+    });
+</script>
+[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/Application/views/blocks/checkout_s5.tpl b/Application/views/blocks/checkout_s5.tpl
new file mode 100644
index 0000000..3129ac6
--- /dev/null
+++ b/Application/views/blocks/checkout_s5.tpl
@@ -0,0 +1,37 @@
+[{strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    [{assign var="_gtmOrder" value=$oView->getOrder()}]
+    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
+    
+    dataLayer.push({
+        'event': 'ee.transaction',
+        'eventLabel':'Checkout Step 5',
+        'ecommerce': {
+            'purchase': {
+                'actionField': {
+                    'id':'[{$_gtmOrder->oxorder__oxordernr->value}]',
+                    'affiliation':'[{$oxcmp_shop->oxshops__oxname->value}]',
+                    'revenue':'[{$_gtmOrder->oxorder__oxtotalordersum->value}]',
+                    'tax':'[{math equation="x+y" x=$_gtmOrder->oxorder__oxartvatprice1->value y=$_gtmOrder->oxorder__oxartvatprice2->value }]',
+                    'shipping':'[{$_gtmOrder->oxorder__oxdelcost->value}]'
+                    /*'coupon':'CANO25' //if a coupon code was used for this order*/
+                },
+                'products':[
+                    [{foreach from=$_gtmArticles item="_gtmArticle" name="gtmArticles"}]
+                    {
+                        'id':'[{$_gtmArticle->oxorderarticles__oxartnum->value}]',
+                        'name': '[{$_gtmArticle->oxorderarticles__oxtitle->value}]',
+                        'variant':'[{$_gtmArticle->oxorderarticles__oxselvariant->value}]',
+                        'price': [{$_gtmArticle->oxorderarticles__oxprice->value}],
+                        'quantity':[{$_gtmArticle->oxorderarticles__oxamount->value}],
+                        'position':[{$smarty.foreach.gtmArticles.iteration}]
+                    }[{if !$smarty.foreach.gtmArticles.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        }
+    });
+</script>
+[{/strip}]
+[{$smarty.block.parent}]
diff --git a/Application/views/blocks/detail.tpl b/Application/views/blocks/detail.tpl
new file mode 100644
index 0000000..072f5bf
--- /dev/null
+++ b/Application/views/blocks/detail.tpl
@@ -0,0 +1,27 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+[{strip}][{/strip}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'ee.detail',
+        'eventLabel':'Product View',
+        'ecommerce': {
+            'currencyCode': '[{$currency->name}]',
+            'detail': {
+                'products': [
+                    {
+                        'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+                        'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value}],
+                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]'
+                    }
+                ]
+            }
+        }
+    });
+</script>
\ No newline at end of file
diff --git a/Application/views/blocks/impression.tpl b/Application/views/blocks/impression.tpl
new file mode 100644
index 0000000..4438bd6
--- /dev/null
+++ b/Application/views/blocks/impression.tpl
@@ -0,0 +1,35 @@
+[{$smarty.block.parent}]
+[{assign var="gtmProduct" value=$oView->getProduct()}]
+[{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+[{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+<script>
+    dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});  /* Clear the previous ecommerce object. */
+    dataLayer.push({
+        'event': 'ee.impression',
+        'eventLabel':'Impression',
+        'ecommerce': {
+            'currencyCode': '[{$currency->name}]',
+            'impressions': [
+                {
+                    'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+                    'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+                    'price': [{$gtmProduct->oxarticles__oxprice->value}],
+                    'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                    'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                    'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]'
+                    [{if $list && $position}],
+                    'list': '[{$list}]',
+                    'position': [{"_"|str_replace:"":$position}]
+                    [{/if}]
+                }
+            ]
+        }
+    });
+</script>
+<!--
+sWidgetType [{$sWidgetType}] | [{$oView->getViewParameter('sWidgetType')}]
+sListType [{$sListType}] | [{$oView->getViewParameter('sListType')}]
+iIndex [{$iIndex}] | [{$oView->getIndex()}]
+listId [{$listId}] | [{$oView->getViewParameter('listId')}]
+testid [{$testid}] | [{$oView->getViewParameter('testid')}]
+-->
\ No newline at end of file
diff --git a/Application/views/ga4/add_to_cart.tpl b/Application/views/ga4/add_to_cart.tpl
new file mode 100644
index 0000000..a3d5e3a
--- /dev/null
+++ b/Application/views/ga4/add_to_cart.tpl
@@ -0,0 +1,41 @@
+[{strip}]
+    [{$gtmProduct|@var_dump}]
+    [{* variable $gtmProduct is passed from parent tempalte *}]
+    [{*
+    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    <script type="text/javascript">
+
+        var itemCategories = '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]'.split('/');
+        //console.log(itemCategories);
+        var _gtmProduct = {
+            'item_name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+            'item_id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+            'price': '[{$gtmProduct->oxarticles__oxprice->value}]',
+            'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+            'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+            'item_category': itemCategories[0] || 'no category',
+            'item_category_2': itemCategories[1] || '',
+            'item_category_3': itemCategories[2] || '',
+            'item_category_4': itemCategories[3] || '',
+            [{if false}]
+            'item_list_name': 'Search Results',  // If associated with a list selection.
+            'item_list_id': 'SR123',  // If associated with a list selection.
+            'index': 1,  // If associated with a list selection.
+            [{/if}]
+            'quantity': '1'
+        };
+
+        console.log(_gtmProduct);
+        dataLayer.push({
+            'event':'ecommerce',
+            'ga4event': 'add_to_cart',
+            'ecommerce': {
+                'items': [ _gtmProduct ]
+            }
+        });
+
+    </script>
+    *}]
+[{/strip}]
\ No newline at end of file
diff --git a/Application/views/ga4/view_item.tpl b/Application/views/ga4/view_item.tpl
new file mode 100644
index 0000000..e44d842
--- /dev/null
+++ b/Application/views/ga4/view_item.tpl
@@ -0,0 +1,26 @@
+[{strip}]
+    [{* variable $gtmProduct is passed from parent tempalte *}]
+    [{assign var="gtmCurrency" value=$oView->getActCurrency()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    <script type="text/javascript">
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'GA4_event',
+            'event_name': 'view_item',
+            'ecommerce': {
+                'items': [
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'item_variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:0}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'quantity': '1'
+                    }
+                ]
+            }
+        });
+    </script>
+[{/strip}]
\ No newline at end of file
diff --git a/Application/views/ga4/view_item_list.tpl b/Application/views/ga4/view_item_list.tpl
new file mode 100644
index 0000000..13d9ce6
--- /dev/null
+++ b/Application/views/ga4/view_item_list.tpl
@@ -0,0 +1,51 @@
+[{if $gtmProducts|@count}]
+[{strip}]
+    <script>
+        /* ga4 */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'GA4_event',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+                'items': [
+                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                    {
+                        'item_id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'item_name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+                        'item_brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'item_category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'quantity': 1
+                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        });
+        /* ua */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event':'UA_event',
+            'event_name': 'view_item_list',
+            'ecommerce': {
+                'currencyCode':'EUR',
+                'impressions': [
+                    [{foreach from=$gtmProducts name="gtmProducts" item="gtmProduct"}]
+                    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+                    [{if !$gtmCategory}][{assign var="gtmCategory" value=$gtmProduct->getCategory()}][{/if}]
+                    {
+                        'id': '[{$gtmProduct->getFieldData("oxartnum")}]',
+                        'name': '[{$gtmProduct->getFieldData("oxtitle")}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value|default:'0'}],
+                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
+                        'position': [{$smarty.foreach.gtmProducts.iterator|default:1}]
+                    }[{if !$smarty.foreach.gtmProducts.last}],[{/if}]
+                    [{/foreach}]
+                ]
+            }
+        });
+    </script>
+[{/strip}]
+[{/if}]
\ No newline at end of file
diff --git a/Application/views/ua/impression.tpl b/Application/views/ua/impression.tpl
new file mode 100644
index 0000000..09dcacc
--- /dev/null
+++ b/Application/views/ua/impression.tpl
@@ -0,0 +1,29 @@
+[{strip}]
+    [{assign var="gtmCategory" value=$gtmProduct->getCategory()}]
+    [{assign var="gtmManufacturer" value=$gtmProduct->getManufacturer()}]
+    <script>
+        /* UA */
+        dataLayer.push({ecommerce: null});
+        dataLayer.push({
+            'event': 'UA_ecommerce',
+            'event_name': 'Impression',
+            'ecommerce': {
+                'currencyCode': '[{$currency->name}]',
+                'impressions': [
+                    {
+                        'name': '[{$gtmProduct->oxarticles__oxtitle->value}]',
+                        'id': '[{$gtmProduct->oxarticles__oxartnum->value}]',
+                        'price': [{$gtmProduct->oxarticles__oxprice->value}],
+                        'brand': '[{if $gtmManufacturer}][{$gtmManufacturer->oxmanufacturers__oxtitle->value}][{/if}]',
+                        'category': '[{if $gtmCategory}][{$gtmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]no category[{/if}]',
+                        'variant': '[{if $gtmProduct->oxarticles__oxvarselect->value}][{$gtmProduct->oxarticles__oxvarselect->value}][{/if}]'
+                        [{if $list && $position}],
+                        'list': '[{$list}]',
+                        'position': [{"_"|str_replace:"":$position}]
+                        [{/if}]
+                    }
+                ]
+            }
+        });
+    </script>
+[{/strip}]
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s1_cart.tpl b/Application/views/ua/s1_cart.tpl
similarity index 92%
rename from copy_this/modules/bla/tag-manager/application/views/blocks/ee/s1_cart.tpl
rename to Application/views/ua/s1_cart.tpl
index 6a81e43..d590b9f 100644
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s1_cart.tpl
+++ b/Application/views/ua/s1_cart.tpl
@@ -1,8 +1,9 @@
 [{strip}]
     [{assign var="gtmCartArticles" value=$oView->getBasketArticles()}]
     <script>
+        dataLayer.push({"event": null, "eventLabel": null, "ecommerce": null});
         dataLayer.push({
-            "event":"ee.checkout",
+            "event":"enhanced-ecommerce",
             "ecommerce": {
                 "checkout": {
                     "actionField": {"step":1},
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s2_user.tpl b/Application/views/ua/s2_user.tpl
similarity index 62%
rename from copy_this/modules/bla/tag-manager/application/views/blocks/ee/s2_user.tpl
rename to Application/views/ua/s2_user.tpl
index abf4c95..989f980 100644
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s2_user.tpl
+++ b/Application/views/ua/s2_user.tpl
@@ -5,7 +5,7 @@
         'ecommerce': {
             'checkout': { 'actionField': {
                 'step': 2,
-                'option':'[{oxmultilang ident="BLA_GTM_EE_LOGINOPTION"|cat:$oView->getLoginOption()}]'
+                'option':'[{oxmultilang ident="VT_GTM_EE_LOGINOPTION"|cat:$oView->getLoginOption()}]'
             } }
         }
     });
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s3_payment.tpl b/Application/views/ua/s3_payment.tpl
similarity index 100%
rename from copy_this/modules/bla/tag-manager/application/views/blocks/ee/s3_payment.tpl
rename to Application/views/ua/s3_payment.tpl
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s4_order.tpl b/Application/views/ua/s4_order.tpl
similarity index 100%
rename from copy_this/modules/bla/tag-manager/application/views/blocks/ee/s4_order.tpl
rename to Application/views/ua/s4_order.tpl
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s5_thankyou.tpl b/Application/views/ua/s5_thankyou.tpl
similarity index 91%
rename from copy_this/modules/bla/tag-manager/application/views/blocks/ee/s5_thankyou.tpl
rename to Application/views/ua/s5_thankyou.tpl
index f8f0117..2523682 100644
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/s5_thankyou.tpl
+++ b/Application/views/ua/s5_thankyou.tpl
@@ -7,8 +7,8 @@
     });
 *}]
     [{assign var="_gtmOrder" value=$oView->getOrder()}]
-    [{assign var="_gtmBasket" value=$oView->getBasket()}]
-    [{assign var="_gtmArticles" value=$_gtmBasket->getBasketArticles()}]
+    [{assign var="_gtmBasket" value=$_gtmOrder->getBasket()}]
+    [{assign var="_gtmArticles" value=$_gtmOrder->getOrderArticles()}]
     
     dataLayer.push({
         'event': 'ee.transaction',
diff --git a/README.md b/README.md
index e7995ad..4d67c56 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,20 @@
-# [bla] tag-manager  
-Tag Manager integration for OXID eShop: Google, Matomo and Yandex  
+# [vt] Google Tag Manager  
+Google Tag Manager integration for OXID eShop v6.2 und höher  
 module version 0.2.0 ( 2018-12-04 )
 
 # Installation
-* [https://github.com/vanilla-thunder/oxid-module-tag-manager/archive/master.zip](https://github.com/vanilla-thunder/oxid-module-tag-manager/archive/master.zip) herunterladen und entpacken
+* ``composer require vanilla-thunder/oxid-module-gtm --no-update``
+
 * Inhalt von "copy_this" in den Shop hochladen
 * Modul aktivieren und Moduleinstellungen konfigurieren
 
-# Einrichtung + allgemeine Funktionsweise:
+# Tag Manager konfigurieren:
++ https://support.google.com/tagmanager/answer/9442095
+
+
+
+
+
 Alle drei unterstützten Tag Manager werden mit Daten aus einer gemeinsamen Datenschicht (dataLayer) gefüttert.   
 Für die einfachste Übersicht der enthaltenen Daten empfehle ich den Vorschau-Modus vom Google Tag Manager.
 
@@ -36,6 +43,9 @@ Hier ist ein Beispiel für die Einrichtung von Enhanced Ecomemrce Tracking über
 
 Eine Video-Anleitung mit der kompletten Google Analytics Einrichtung folgt in Kürze.
 
+### Google Analytics 4 Referenz
+https://developers.google.com/tag-manager/ecommerce-ga4
+
 
 ### LICENSE AGREEMENT
    [bla] tag-manager  
diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..ddaaa31
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,30 @@
+{
+  "name": "vanilla-thunder/oxid-module-gtm",
+  "description": "Google Tag Manager with new Google Analytics 4 for OXID eShop v6.2+<br/>more about GA4: <a href='https://developers.google.com/tag-manager/ecommerce-ga4' target='_blank'>Ecommerce (GA4) Developer Guide</a>",
+  "type": "oxideshop-module",
+  "homepage": "https://github.com/vanilla-thunder/oxid-module-gtm",
+  "license": [
+    "GPL-3.0"
+  ],
+  "authors": [
+    {
+      "name": "Marat Bedoev",
+      "email": "hello@mb-dev.pro"
+    }
+  ],
+  "extra": {
+    "oxideshop": {
+      "target-directory": "vt/GoogleTagManager"
+    }
+  },
+  "require": {
+    "php": ">=7.1",
+    "oxid-esales/oxideshop-ce": "^v6.2",
+    "google/apiclient":" ^2.0"
+  },
+  "autoload": {
+    "psr-4": {
+      "VanillaThunder\\": "../../../source/modules/vt"
+    }
+  }
+}
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/LICENSE b/copy_this/modules/bla/tag-manager/LICENSE
deleted file mode 100644
index 733c072..0000000
--- a/copy_this/modules/bla/tag-manager/LICENSE
+++ /dev/null
@@ -1,675 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    {one line to give the program's name and a brief idea of what it does.}
-    Copyright (C) {year}  {name of author}
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    {project}  Copyright (C) {year}  {fullname}
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.
-
diff --git a/copy_this/modules/bla/tag-manager/README.md b/copy_this/modules/bla/tag-manager/README.md
deleted file mode 100644
index e7995ad..0000000
--- a/copy_this/modules/bla/tag-manager/README.md
+++ /dev/null
@@ -1,51 +0,0 @@
-# [bla] tag-manager  
-Tag Manager integration for OXID eShop: Google, Matomo and Yandex  
-module version 0.2.0 ( 2018-12-04 )
-
-# Installation
-* [https://github.com/vanilla-thunder/oxid-module-tag-manager/archive/master.zip](https://github.com/vanilla-thunder/oxid-module-tag-manager/archive/master.zip) herunterladen und entpacken
-* Inhalt von "copy_this" in den Shop hochladen
-* Modul aktivieren und Moduleinstellungen konfigurieren
-
-# Einrichtung + allgemeine Funktionsweise:
-Alle drei unterstützten Tag Manager werden mit Daten aus einer gemeinsamen Datenschicht (dataLayer) gefüttert.   
-Für die einfachste Übersicht der enthaltenen Daten empfehle ich den Vorschau-Modus vom Google Tag Manager.
-
-Bei jedem Seitenaufruf wird die Datenschicht mit einigen wenigen Infos erstellt, die man zum reinen Erfassen der Seitenaufrufe benötigt:
- + **page.type** - Seitentyp: default / cms / product / listing / checkout (an google analytics angelehnt) 
- + **page.title** - Seitentitel (außer Startseite, sie hat keinen Titel. Danke OXID...)
- + **page.class** - OXID Controller Klasse (start, search, etc)
- + **user.country** - Land des Benutzers, sofern dieser angemeldet ist.
- + **user.httpref** - http referrer
- 
-Alle für Ecommerce Tracking releavanten Daten werden mit speziellen Ecommerce Events in die Datenschicht eingefügt.
-Hier ist ein Beispiel für die Einrichtung von Enhanced Ecomemrce Tracking über Google Tag Manager:
-  
-**"EE-Trigger" für Ecomemrce-Tags (Beispiel für Google Tag Manager):**  
-+ Triggertyp: Benutzerdefiniertes Ereignis
-+ Ereignisname: ``ee\..*``
-+ Übereinstimmung mit regulärem Ausdruck verwenden
-+ Diesen Trigger auslösen bei: Alle benutzerdefinierten Ereignisse
-
-**"EE-Tag" für Google Analytics Enhanced Ecommerce:**
-+ Tag-Typ: Google Analytics - Universal Analytics
-+ Tracking-Typ: Ereignis
-+ Aktion: {{Event}}
-+ Label: {{Event Label}}
-+ Trigger : EE-Trigger
-
-Eine Video-Anleitung mit der kompletten Google Analytics Einrichtung folgt in Kürze.
-
-
-### LICENSE AGREEMENT
-   [bla] tag-manager  
-   Copyright (C) 2018 bestlife AG  
-   info:  oxid@bestlife.ag  
-  
-   This program is free software;  
-   you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
-   either version 3 of the License, or (at your option) any later version.
-  
-   This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;  
-   without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
-   You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/extend/ShopgatePluginOxid_blatm.php b/copy_this/modules/bla/tag-manager/application/extend/ShopgatePluginOxid_blatm.php
deleted file mode 100644
index f2d24b6..0000000
--- a/copy_this/modules/bla/tag-manager/application/extend/ShopgatePluginOxid_blatm.php
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-class ShopgatePluginOxid_blatm extends ShopgatePluginOxid_blatm_parent
-{
-
-    // das hat für andere Shopbetreiber eigentlich keinen Zweck, es ist nur für Shopgate Apps
-    public function addOrder(ShopgateOrder $order)
-    {
-        oxRegistry::getSession()->setVariable("shopgateorder","jaaaaaa");
-        return parent::addOrder($order);
-    }
-    /*
-    protected function loadOrderAdditionalInfo(oxOrder &$oxOrder)
-    {
-        $oxOrder->oxorder__blamediacode = new oxField(oxRegistry::getConfig()->getConfigParam("bla-mediacode_shopgatemediacode"));
-        parent::loadOrderAdditionalInfo($oxOrder);
-    }
-    */
-}
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/extend/oxorder_blatm.php b/copy_this/modules/bla/tag-manager/application/extend/oxorder_blatm.php
deleted file mode 100644
index d91e1a9..0000000
--- a/copy_this/modules/bla/tag-manager/application/extend/oxorder_blatm.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-class oxorder_blatm extends oxorder_blatm_parent
-{
-
-    protected function _setUser ($oUser)
-    {
-        parent::_setUser($oUser);
-
-        $cfg = oxRegistry::getConfig();
-        $oxSession = oxRegistry::getSession();
-
-        $aRefs = $oxSession->getVariable('bla_refs');
-
-        $this->assign(['oxorder__blahttpref' =>  $aRefs['http']]);
-
-        if ($oxSession->getVariable('shopgateorder')) {
-            $this->assign(['oxorder__blaref' => $cfg->getConfigParam("bla_tm_shopgateref")]);
-            $oxSession->deleteVariable('shopgateorder');
-        }
-        else $this->assign(['oxorder__blaref' =>  ($aRefs['ref'] ? $aRefs['ref'] : $cfg->getConfigParam('bla_tm_defaultref'))]);
-
-        $this->assign(['oxorder__blasubref' =>  $aRefs['subref']]);
-    }
-}
diff --git a/copy_this/modules/bla/tag-manager/application/extend/oxsession_blatm.php b/copy_this/modules/bla/tag-manager/application/extend/oxsession_blatm.php
deleted file mode 100644
index b124cbc..0000000
--- a/copy_this/modules/bla/tag-manager/application/extend/oxsession_blatm.php
+++ /dev/null
@@ -1,38 +0,0 @@
-<?php
-
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-class oxsession_blatm extends oxsession_blatm_parent
-{
-	public function start ()
-	{
-		parent::start();
-
-		// check if blForceSessionStart is set to true in config.inc.php
-		if ($this->_allowSessionStart() && !parent::_getCookieSid())
-		{
-			$cfg = oxRegistry::getConfig();
-			$aRefs = [
-				'http'   => (isset($_SERVER['HTTP_REFERER']) && !empty($_SERVER['HTTP_REFERER'])) ? $_SERVER['HTTP_REFERER'] : '-',
-				'ref'    => current(array_filter([
-					$cfg->getRequestParameter('ref'),
-					$cfg->getRequestParameter('REF'),
-					$cfg->getRequestParameter('utm_content')
-				])),
-				'subref' => $cfg->getRequestParameter('subref')
-			];
-			self::setVariable('bla_refs', $aRefs);
-		}
-	}
-}
diff --git a/copy_this/modules/bla/tag-manager/application/files/blatm_events.php b/copy_this/modules/bla/tag-manager/application/files/blatm_events.php
deleted file mode 100644
index ec8a4fa..0000000
--- a/copy_this/modules/bla/tag-manager/application/files/blatm_events.php
+++ /dev/null
@@ -1,48 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-class blatm_events extends oxI18n
-{
-    public static function onActivate()
-    {
-        /** @var oxLegacyDb $oDb */
-        $oDb = oxDb::getDB();
-        $aColumns = $oDb->getRow("SHOW COLUMNS FROM oxorder");
-
-        // rename BLAREFERRER column -> BLAHTTPREF or create new
-        if( array_key_exists( "BLAREFERRER", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAREFERRER` `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla/tag-manager http ref'");
-        else if(!array_key_exists( "BLAHTTPREF", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla/tag-manager http ref'");
-
-        // rename BLAMEDIACODE column -> BLAREF or create new
-        if( array_key_exists( "BLAMEDIACODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAMEDIACODE` `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager ref'");
-        else if(!array_key_exists( "BLAREF",     $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager ref'");
-
-        // rename BLASUBCODE column -> BLASUBREF or create new
-        if( array_key_exists( "BLASUBCODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLASUBCODE` `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager subref'");
-        else if(!array_key_exists( "BLASUBREF",  $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla/tag-manager subref'");
-
-        // regenerating DB views
-        $oMetaData = oxNew('oxDbMetaDataHandler');
-        $oMetaData->updateViews();
-
-        //clear tmp
-        foreach (glob(oxRegistry::getConfig()->getConfigParam("sCompileDir") . "smarty/*") as $item) if (!is_dir($item)) unlink($item);
-    }
-
-    /*
-        public static function onDeactivate() {
-        }
-    */
-}
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/files/blatracking_events.php b/copy_this/modules/bla/tag-manager/application/files/blatracking_events.php
deleted file mode 100644
index 77fc5f5..0000000
--- a/copy_this/modules/bla/tag-manager/application/files/blatracking_events.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-/**
- *   tag-manager
- *  Copyright (C) 2018  bestlife AG
- *  info:  oxid@bestlife.ag
- *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- **/
-
-class blatracking_events extends oxI18n {
-
-	/**
-	 * Executed when module is being activated.
-     *  funktioniert. geprüft am 2018-02-23
-	 */
-	public static function onActivate()
-    {
-        /** @var oxLegacyDb $oDb */
-        $oDb = oxDb::getDB();
-        $aColumns = $oDb->getRow("SHOW COLUMNS FROM oxorder");
-
-        // rename BLAREFERRER column or create new
-		if( array_key_exists( "BLAREFERRER", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAREFERRER` `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla-tracking http ref'");
-        else if(!array_key_exists( "BLAHTTPREF", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAHTTPREF` TEXT NOT NULL COMMENT 'bla-tracking http ref'");
-
-        // rename BLAMEDIACODE column or create new
-        if( array_key_exists( "BLAMEDIACODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLAMEDIACODE` `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla-tracking ref'");
-        else if(!array_key_exists( "BLAREF",     $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLAREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla-tracking ref'");
-
-        // rename BLASUBCODE column or create new
-        if( array_key_exists( "BLASUBCODE", $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` CHANGE `BLASUBCODE` `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla-tracking subref'");
-        else if(!array_key_exists( "BLASUBREF",  $aColumns )) $oDb->Execute("ALTER TABLE `oxorder` ADD `BLASUBREF` VARCHAR( 64 ) NOT NULL COMMENT 'bla-tracking subref'");
-
-		// regenerating DB views
-		$oMetaData = oxNew('oxDbMetaDataHandler');
-		$oMetaData->updateViews();
-
-        //clear tmp
-        foreach (glob(oxRegistry::getConfig()->getConfigParam("sCompileDir") . "smarty/*") as $item) if (!is_dir($item)) unlink($item);
-	}
-
-/*
-	public static function onDeactivate() {
-	}
-*/
-}
diff --git a/copy_this/modules/bla/tag-manager/application/views/admin/blocks/admin_order_overview_checkout.tpl b/copy_this/modules/bla/tag-manager/application/views/admin/blocks/admin_order_overview_checkout.tpl
deleted file mode 100644
index 646200f..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/admin/blocks/admin_order_overview_checkout.tpl
+++ /dev/null
@@ -1,20 +0,0 @@
-[{$smarty.block.parent}]
-<tr><td colspan=2><br></td></tr>
-[{if $edit->oxorder__blaref->value}]
-<tr>
-    <td class="edittext"><b>REF:</b></td>
-    <td class="edittext">[{$edit->oxorder__blaref->value}]</td>
-</tr>
-[{/if}]
-[{if $edit->oxorder__blasubref->value}]
-<tr>
-    <td class="edittext"><b>SUB-REF:</b></td>
-    <td class="edittext">[{$edit->oxorder__blasubref->value}]</td>
-</tr>
-[{/if}]
-[{if $edit->oxorder__blahttpref->value}]
-<tr>
-    <td class="edittext"><b>HTTP REF:</b></td>
-    <td class="edittext">[{$edit->oxorder__blahttpref->value}]</td>
-</tr>
-[{/if}]
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/views/admin/de/module_options.php b/copy_this/modules/bla/tag-manager/application/views/admin/de/module_options.php
deleted file mode 100644
index 76bab77..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/admin/de/module_options.php
+++ /dev/null
@@ -1,37 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-$style = '<style type="text/css">
-.groupExp a.rc b {font-size:medium;color:#ff3600;}
-.groupExp dt input.txt {width:430px !important}
-.groupExp dt .select {width:437px !important;}
-.groupExp dt textarea.txtfield {width:430px height: 150px;}
-.groupExp dl { display:block !important;}
-input.confinput {position:fixed;top:20px;right:70px;background:#008B2D;padding:10px 25px;color:white;border:1px solid black;cursor:pointer;font-size:125%;}
-input.confinput:hover {outline:3px solid #ff3600;}
-</style>';
-$aLang = [
-	'charset'                                    => 'UTF-8',
-	'SHOP_MODULE_GROUP_bla_tm_Main'              => $style . 'Einstellungen',
-	'SHOP_MODULE_bla_gtm_id'                     => 'Google Tag Manager ID',
-	'SHOP_MODULE_bla_tm_productlistcategories'   => 'Handhabung der Kategorien in Produktlisten Performance in Google Analytics',
-	'SHOP_MODULE_bla_tm_productlistcategories_0' => 'Kategorien von Product Lists Performance ausschließen',
-	'SHOP_MODULE_bla_tm_productlistcategories_1' => 'Alle Kategorien unter dem Namen "Kategorien" zusammenfassen',
-	'SHOP_MODULE_bla_tm_productlistcategories_2' => 'Kategorien einzeln erfassen',
-	'SHOP_MODULE_bla_mtm_id'                     => 'Matomo Container URL <small>( https://piwik.tld/js/container_ASFG123.js )</small>',
-	'SHOP_MODULE_bla_ym_id'                      => 'Yandex Metrica ID',
-	'SHOP_MODULE_bla_tm_defaultref'              => 'default REF',
-	'SHOP_MODULE_bla_tm_shopgateref'             => 'shopgate orders REF'
-];
diff --git a/copy_this/modules/bla/tag-manager/application/views/admin/en/module_options.php b/copy_this/modules/bla/tag-manager/application/views/admin/en/module_options.php
deleted file mode 100644
index e69de29..0000000
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/base_head_meta_robots.tpl b/copy_this/modules/bla/tag-manager/application/views/blocks/base_head_meta_robots.tpl
deleted file mode 100644
index c6eac95..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/base_head_meta_robots.tpl
+++ /dev/null
@@ -1,61 +0,0 @@
-[{if $oViewConf->isTagmanagerEnabled()}]
-    [{strip}]
-        <script type="text/javascript">
-            var dataLayer = dataLayer || [{$oViewConf->getDataLayer()}];
-            [{if $oViewConf->getGTMid()}]
-            /* Google Tag Manager */
-            (function (w, d, s, l, i) {
-                w[l] = w[l] || [];
-                w[l].push({'gtm.start': new Date().getTime(), event: 'gtm.js'});
-                var f = d.getElementsByTagName(s)[0], j = d.createElement(s), dl = l != 'dataLayer' ? '&l=' + l : '';
-                j.async = true;
-                j.src = 'https://www.googletagmanager.com/gtm.js?id=' + i + dl;
-                f.parentNode.insertBefore(j, f);
-            })(window, document, 'script', 'dataLayer', '[{$oViewConf->getGTMid()}]');
-            /* End Google Tag Manager */
-            [{/if}]
-            [{if $oViewConf->getMTMid()}]
-            /* Matomo Tag Manager */
-            var _mtm = _mtm || [];
-            _mtm.push({'mtm.startTime': (new Date().getTime()), 'event': 'mtm.Start'});
-            var d = document, g = d.createElement('script'), s = d.getElementsByTagName('script')[0];
-            g.type = 'text/javascript';
-            g.async = true;
-            g.defer = true;
-            g.src = '[{$oViewConf->getMTMid()}]';
-            s.parentNode.insertBefore(g, s);
-            /* End Matomo Tag Manager */
-            [{/if}]
-            [{if $oViewConf->getYMid()}]
-            /* Yandex.Metrika */
-            (function (d, w, c) {
-                (w[c] = w[c] || []).push(function () {
-                    try {
-                        w.yaCounter[{$oViewConf->getYMid()}] = new Ya.Metrika2({
-                            id: [{$oViewConf->getYMid()}],
-                            clickmap: true,
-                            trackLinks: true,
-                            accurateTrackBounce: true,
-                            webvisor: true,
-                            ecommerce: "dataLayer"
-                        });
-                    } catch (e) {}
-                });
-
-                var n = d.getElementsByTagName("script")[0],
-                    s = d.createElement("script"),
-                    f = function () {
-                        n.parentNode.insertBefore(s, n);
-                    };
-                s.type = "text/javascript";
-                s.async = true;
-                s.src = "https://mc.yandex.ru/metrika/tag.js";
-                if (w.opera == "[object Opera]") d.addEventListener("DOMContentLoaded", f, false);
-                else f();
-            })(document, window, "yandex_metrika_callbacks2");
-            /* END Yandex.Metrika counter */
-            [{/if}]
-        </script>
-    [{/strip}]
-[{/if}]
-[{$smarty.block.parent}]
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/detail.tpl b/copy_this/modules/bla/tag-manager/application/views/blocks/ee/detail.tpl
deleted file mode 100644
index b4995af..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/detail.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-[{strip}]
-    [{assign var="_cur" value=$oView->getActCurrency()}]
-    [{assign var="_tmProduct" value=$oView->getProduct()}]
-    [{assign var="_tmManufacturer" value=$_tmProduct->getManufacturer()}]
-    [{assign var="_tmCategory" value=$_tmProduct->getCategory()}]
-    <script type="text/javascript">
-        var _products = [
-            {
-                'name': '[{$_tmProduct->oxarticles__oxtitle->value}]',
-                [{if $_tmProduct->oxarticles__oxvarselect->value}]'variant':'[{$_tmProduct->oxarticles__oxvarselect->value}]',[{/if}]
-                'id': '[{$_tmProduct->oxarticles__oxartnum->value}]',
-                'price': [{$_tmProduct->oxarticles__oxprice->value}],
-                [{if $_tmManufacturer}]'brand':'[{$_tmManufacturer->oxmanufacturers__oxtitle->value}]',[{/if}]
-                'category': '[{if $_tmCategory}][{$_tmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]'
-            }
-        ];
-
-        var getRefPath = function() {
-            var l = document.createElement("a");
-            l.href = document.referrer;
-            return l.pathname;
-        };
-
-        if( typeof document.referrer !== "undefined"
-            && document.referrer.indexOf(document.location.hostname) !== -1 /* Besucher ist von hier */
-            /*&& getRefPath() !== "/index.php" */
-            && document.location.pathname !== "/index.php"
-            && getRefPath() !== document.location.pathname)
-        {
-            /*console.log("jap, der kommt von hier!");*/
-            dataLayer.push({
-                'event': 'ee.click',
-                'eventLabel':'Click',
-                'ecommerce': {
-                    'currencyCode': '[{$_cur->name}]',
-                    'click': {
-                        'actionField': {'list': getRefPath().replace(/^\//, "").replace(/\/$/, "")},
-                        'products': _products
-                    }
-                }
-            });
-        }
-        dataLayer.push({
-            'event':'ee.product',
-            'eventLabel':'Product View',
-            'ecommerce': {
-                'currencyCode': '[{$_cur->name}]',
-                'detail': {
-                    [{* 'actionField': { 'list': document.referrer.replace("[{$oViewConf->getHomeLink()}]","").replace(/\/$/, "") }, *}]
-                    'products': _products
-                }
-            }
-        });
-[{oxscript add="$('#toBasket').parents('form').on('submit',function(e) {dataLayer.push({'event':'ee.addToCart','ecommerce':{'currencyCode':'`$_cur->name`','add':{'products':_products}}});return true;});"}]
-    </script>
-[{/strip}]
-[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/impression.tpl b/copy_this/modules/bla/tag-manager/application/views/blocks/ee/impression.tpl
deleted file mode 100644
index 42f408e..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/ee/impression.tpl
+++ /dev/null
@@ -1,34 +0,0 @@
-[{$smarty.block.parent}]
-[{strip}]
-    [{assign var="_tmProduct" value=$oView->getProduct()}]
-    [{assign var="_tmCategory" value=$_tmProduct->getCategory()}]
-    [{* assign var="_tmManufacturer" value=$_tmProduct->getManufacturer() *}]
-    [{* setting: [{ $oViewConf->getGTMproductListPerformanceSetting() }] || id: [{$listId}] *}]
-    <script>
-        dataLayer.push({
-            'event':'ee.impression',
-            'eventLabel':'Impression',
-            'ecommerce': {
-                'currencyCode': '[{$currency->name}]',
-                'impressions': [
-                    {
-                        'name': '[{$_tmProduct->oxarticles__oxtitle->value}]',
-                        'id':   '[{$_tmProduct->oxarticles__oxartnum->value}]',
-                        'price': [{$_tmProduct->oxarticles__oxprice->value}],
-                        'category': '[{if $_tmCategory}][{$_tmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                        [{if $listId == 'productList' || $listId == 'categoryList'}]
-                            [{if $oViewConf->getGTMproductListPerformanceSetting() == "1"}]
-                                'list': '[{oxmultilang ident="CATEGORIES"}]',
-                            [{elseif $oViewConf->getGTMproductListPerformanceSetting() == "2"}]
-                                'list': '[{if $_tmCategory}][{$_tmCategory->getLink()|parse_url:5|ltrim:"/"|rtrim:"/"}][{else}]-[{/if}]',
-                            [{/if}]
-                        [{else}]
-                            'list': '[{$listId|default:$oView->getClassName()}]',
-                        [{/if}]
-                        'position': [{$smarty.foreach.productlist.iteration|default:1}]
-                    }
-                ]
-            }
-        });
-    </script>
-[{/strip}]
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/email_html_order_owner_orderemail.tpl b/copy_this/modules/bla/tag-manager/application/views/blocks/email_html_order_owner_orderemail.tpl
deleted file mode 100644
index 61f7d38..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/email_html_order_owner_orderemail.tpl
+++ /dev/null
@@ -1,23 +0,0 @@
-[{$smarty.block.parent}]
-[{if $order->oxorder__blaref->value || $order->oxorder__blasubref->value || $order->oxorder__blahttpref->value}]
-    <table style="width:90%; margin: 10px auto; font-sizer: 12px; color:black;">
-        [{if $order->oxorder__blaref->value}]
-            <tr>
-                <td class="edittext"><b>REF:</b></td>
-                <td class="edittext">[{$order->oxorder__blaref->value}]</td>
-            </tr>
-        [{/if}]
-        [{if $order->oxorder__blasubref->value}]
-            <tr>
-                <td class="edittext"><b>SUB-REF:</b></td>
-                <td class="edittext">[{$order->oxorder__blasubref->value}]</td>
-            </tr>
-        [{/if}]
-        [{if $order->oxorder__blahttpref->value}]
-            <tr>
-                <td class="edittext"><b>HTTP REF:</b></td>
-                <td class="edittext">[{$order->oxorder__blahttpref->value}]</td>
-            </tr>
-        [{/if}]
-    </table>
-[{/if}]
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/application/views/blocks/theme_svg_icons.tpl b/copy_this/modules/bla/tag-manager/application/views/blocks/theme_svg_icons.tpl
deleted file mode 100644
index ee7a610..0000000
--- a/copy_this/modules/bla/tag-manager/application/views/blocks/theme_svg_icons.tpl
+++ /dev/null
@@ -1,8 +0,0 @@
-[{if $oViewConf->getGTMid() || $oViewConf->getYMid() }][{strip}]
-    <noscript>
-        [{if $oViewConf->getGTMid()}]<iframe src="//www.googletagmanager.com/ns.html?id=[{$oViewConf->getGTMid()}]" height="0" width="0" style="display:none;visibility:hidden"></iframe>[{/if}]
-        [{* [{if $oViewConf->getMTMid()}][{/if}] *}]
-        [{if $oViewConf->getYMid()}]<img src="https://mc.yandex.ru/watch/[{$oViewConf->getYMid()}]" style="position:absolute; left:-9999px;" alt=""/>[{/if}]
-    </noscript>
-[{/strip}][{/if}]
-[{$smarty.block.parent}]
\ No newline at end of file
diff --git a/copy_this/modules/bla/tag-manager/metadata.php b/copy_this/modules/bla/tag-manager/metadata.php
deleted file mode 100644
index 085708a..0000000
--- a/copy_this/modules/bla/tag-manager/metadata.php
+++ /dev/null
@@ -1,181 +0,0 @@
-<?php
-/**
- * [bla] tag-manager
- * Copyright (C) 2018  bestlife AG
- * info:  oxid@bestlife.ag
- *
- * This program is free software;
- * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
- * either version 3 of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
- * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
- * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
- **/
-
-$sMetadataVersion = '1.1';
-$aModule = [
-    'id'          => 'tag-manager',
-    'title'       => '<strong style="color:#95b900;font-size:125%;">best</strong><strong style="color:#c4ca77;font-size:125%;">life</strong> <strong>Tag Manager</strong>',
-    'description' => 'Tag Manager integration for OXID eShop: Google, Matomo and Yandex',
-    'thumbnail'   => '../bestlife.png',
-    'version'     => '0.2.0 ( 2018-12-04 )',
-    'author'      => 'Marat Bedoev, bestlife AG',
-    'email'       => 'oxid@bestlife.ag',
-    'url'         => 'https://github.com/vanilla-thunder/oxid-module-tag-manager',
-    'extend'      => [
-        // http ref & co
-        'oxorder'            => 'bla/tag-manager/application/extend/oxorder_blatm',
-        'oxsession'          => 'bla/tag-manager/application/extend/oxsession_blatm',
-        // ref Anpassung für Shopgate
-        'ShopgatePluginOxid' => 'bla/tag-manager/application/extend/ShopgatePluginOxid_blatm',
-        // ecommerce tracking
-        'oxviewconfig'       => 'bla/tag-manager/application/extend/oxviewconf_blatm'
-    ],
-    'files'       => [
-        'blatm_events' => 'bla/tag-manager/application/files/blatm_events.php',
-    ],
-    'events' => [
-        'onActivate' => 'blatm_events::onActivate'
-    ],
-    'templates'   => [],
-    'blocks'      => [
-		// refs
-		[
-			'template' => 'order_overview.tpl',
-			'block'    => 'admin_order_overview_checkout',
-			'file'     => '/application/views/admin/blocks/admin_order_overview_checkout.tpl'
-		],
-		[
-			'template' => 'email/html/order_owner.tpl',
-			'block'    => 'email_html_order_owner_orderemail',
-			'file'     => '/application/views/blocks/email_html_order_owner_orderemail.tpl'
-		],
-		// tag manager js
-		[
-			'template' => 'layout/base.tpl',
-			'block'    => 'head_meta_robots',
-			'file'     => '/application/views/blocks/base_head_meta_robots.tpl'
-		],
-		// tag manager nojs
-		[
-			'template' => 'layout/base.tpl',
-			'block'    => 'theme_svg_icons',
-			'file'     => '/application/views/blocks/theme_svg_icons.tpl'
-		],
-		// detail + click + add to basket
-		[
-		  'template' => 'page/details/inc/productmain.tpl',
-		  'block'    => 'details_productmain_title',
-		  'file'     => '/application/views/blocks/ee/detail.tpl'
-		],
-		// impression
-		[
-			'template' => 'widget/product/listitem_grid.tpl',
-			'block'    => 'widget_product_listitem_grid_tobasket',
-			'file'     => '/application/views/blocks/ee/impression.tpl'
-		],
-		[
-			'template' => 'widget/product/listitem_infogrid.tpl',
-			'block'    => 'widget_product_listitem_infogrid_tobasket',
-			'file'     => '/application/views/blocks/ee/impression.tpl'
-		],
-		[
-			'template' => 'widget/product/listitem_line.tpl',
-			'block'    => 'widget_product_listitem_line_tobasket',
-			'file'     => '/application/views/blocks/ee/impression.tpl'
-		],
-		[
-			'template' => 'widget/product/boxproduct.tpl',
-			'block'    => 'widget_product_boxproduct_price',
-			'file'     => '/application/views/blocks/ee/impression.tpl'
-		],
-		// checkout
-		[
-			'template' => 'page/checkout/basket.tpl',
-			'block'    => 'checkout_basket_main',
-			'file'     => '/application/views/blocks/ee/s1_cart.tpl'
-		],
-		[
-			'template' => 'form/user_checkout_change.tpl',
-			'block'    => 'user_checkout_change',
-			'file'     => '/application/views/blocks/ee/s2_user.tpl'
-		],
-		[
-			'template' => 'form/user_checkout_register.tpl',
-			'block'    => 'user_checkout_register',
-			'file'     => '/application/views/blocks/ee/s2_user.tpl'
-		],
-		[
-			'template' => 'form/user_checkout_noregister.tpl',
-			'block'    => 'user_checkout_noregister',
-			'file'     => '/application/views/blocks/ee/s2_user.tpl'
-		],
-		[
-			'template' => 'page/checkout/payment.tpl',
-			'block'    => 'checkout_payment_main',
-			'file'     => '/application/views/blocks/ee/s3_payment.tpl'
-		],
-		[
-			'template' => 'page/checkout/order.tpl',
-			'block'    => 'checkout_order_main',
-			'file'     => '/application/views/blocks/ee/s4_order.tpl'
-		],
-		[
-			'template' => 'page/checkout/thankyou.tpl',
-			'block'    => 'checkout_thankyou_main',
-			'file'     => '/application/views/blocks/ee/s5_thankyou.tpl'
-		]
-	],
-	'settings'    => [
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_gtm_id',
-			'type'  => 'str',
-			'value' => ''
-		],
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_tm_productlistcategories',
-			'type'  => 'select',
-			'value' => '0',
-			'constraints' => '0|1|2'
-		],
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_mtm_id',
-			'type'  => 'str',
-			'value' => ''
-		],
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_ym_id',
-			'type'  => 'str',
-			'value' => ''
-		],
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_tm_defaultref',
-			'type'  => 'str',
-			'value' => '123456'
-		],
-		[
-			'group' => 'bla_tm_Main',
-			'name'  => 'bla_tm_shopgateref',
-			'type'  => 'str',
-			'value' => 'SHOPGATE'
-		]
-	]
-];
-
-
-/* todo:
-
-        modified:   application/translations/de/blagtm_lang.php
-        modified:   application/views/blocks/base_head_meta_robots.tpl
-        modified:   application/views/blocks/ee/impression.tpl
-        modified:   application/views/blocks/ee/s5_thankyou.tpl
-        modified:   application/views/blocks/email_html_order_owner_orderemail.tpl
-        modified:   application/views/blocks/theme_svg_icons.tpl
-
-*/
\ No newline at end of file
diff --git a/copy_this/modules/bla/vendormetadata.php b/copy_this/modules/bla/vendormetadata.php
deleted file mode 100644
index e69de29..0000000
diff --git a/metadata.php b/metadata.php
new file mode 100644
index 0000000..3d912a3
--- /dev/null
+++ b/metadata.php
@@ -0,0 +1,156 @@
+<?php
+/**
+ * vanilla-thunder/oxid-module-gtm
+ * Google Tag Manager Integration for OXID eShop v6.2+
+ *
+ * This program is free software;
+ * you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation;
+ * either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
+ * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details.
+ * You should have received a copy of the GNU General Public License along with this program; if not, see <http://www.gnu.org/licenses/>
+ **/
+
+$sMetadataVersion = '2.1';
+$aModule = [
+    'id' => 'vt-gtm',
+    'title' => '[vt] Google Tag Manager',
+    'description' => 'Google Tag Manager Integration for OXID eShop v6.2+',
+    'thumbnail' => 'thumbnail.png',
+    'version' => '0.5.0 ( 2021-07-17 )',
+    'author' => 'Marat Bedoev',
+    'email' => openssl_decrypt("Az6pE7kPbtnTzjHlPhPCa4ktJLphZ/w9gKgo5vA//p4=", str_rot13("nrf-128-pop"), str_rot13("gvalzpr")),
+    'url' => 'https://github.com/vanilla-thunder/oxid-module-gtm',
+    'extend' => [
+        \OxidEsales\Eshop\Core\ViewConfig::class => VanillaThunder\GoogleTagManager\Application\Extend\ViewConfig::class
+    ],
+    'templates' => [
+        // separate ee-event templates for easy integration
+        //'ga4_add_to_cart.tpl' => 'vt/GoogleTagManager/Application/views/ga4/add_to_cart.tpl',
+        //'ga4_view_item.tpl' => 'vt/GoogleTagManager/Application/views/ga4/view_item.tpl',
+        //'ga4_view_item_list.tpl' => 'vt/GoogleTagManager/Application/views/ga4/view_item_list.tpl',
+        'gtm_ua_impression' => 'vt/GoogleTagManager/Application/views/ua/impression.tpl'
+        /*
+
+        'gtm_view_promotion.tpl'   => 'vt/GoogleTagManager/Application/views/view_promotion.tpl',
+        'gtm_select_promotion.tpl' => 'vt/GoogleTagManager/Application/views/select_promotion.tpl',
+        'gtm_begin_checkout.tpl'   => 'vt/GoogleTagManager/Application/views/begin_checkout.tpl',
+        */
+    ],
+    'blocks' => [
+        // tag manager js
+        [
+            'template' => 'layout/base.tpl',
+            'block' => 'head_meta_robots',
+            'file' => '/Application/views/blocks/_gtm_js.tpl'
+        ],
+        // tag manager nojs
+        [
+            'template' => 'layout/base.tpl',
+            'block' => 'theme_svg_icons',
+            'file' => '/Application/views/blocks/_gtm_nojs.tpl'
+        ],
+        // add to cart
+        [
+            'template' => 'layout/header.tpl',
+            'block' => 'header_main',
+            'file' => '/Application/views/blocks/add_to_cart.tpl'
+        ],
+        // impressions
+        [
+            'template' => 'widget/product/listitem_grid.tpl',
+            'block' => 'widget_product_listitem_grid',
+            'file' => '/Application/views/blocks/impression.tpl'
+        ],
+        [
+            'template' => 'widget/product/listitem_infogrid.tpl',
+            'block' => 'widget_product_listitem_infogrid',
+            'file' => '/Application/views/blocks/impression.tpl'
+        ],
+        [
+            'template' => 'widget/product/listitem_line.tpl',
+            'block' => 'widget_product_listitem_line',
+            'file' => '/Application/views/blocks/impression.tpl'
+        ],
+        // details
+        [
+            'template' => 'page/details/inc/productmain.tpl',
+            'block' => 'details_productmain_title',
+            'file' => '/Application/views/blocks/detail.tpl'
+        ],
+        // checkout
+        [
+            'template' => 'page/checkout/basket.tpl',
+            'block' => 'checkout_basket_main',
+            'file' => '/Application/views/blocks/checkout_s1.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_change.tpl',
+            'block' => 'user_checkout_change',
+            'file' => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_register.tpl',
+            'block' => 'user_checkout_register',
+            'file' => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'form/user_checkout_noregister.tpl',
+            'block' => 'user_checkout_noregister',
+            'file' => '/Application/views/blocks/checkout_s2.tpl'
+        ],
+        [
+            'template' => 'page/checkout/payment.tpl',
+            'block' => 'checkout_payment_main',
+            'file' => '/Application/views/blocks/checkout_s3.tpl'
+        ],
+        [
+            'template' => 'page/checkout/order.tpl',
+            'block' => 'checkout_order_main',
+            'file' => '/Application/views/blocks/checkout_s4.tpl'
+        ],
+        [
+            'template' => 'page/checkout/thankyou.tpl',
+            'block' => 'checkout_thankyou_main',
+            'file' => '/Application/views/blocks/checkout_s5.tpl'
+        ]
+    ],
+    'settings' => [
+        [
+            'group' => 'vt_gtm_settings',
+            'name' => 'vt_gtm_containerid',
+            'type' => 'str',
+            'value' => 'GTM-',
+            'position' => 0
+        ],
+        [
+            'group' => 'vt_gtm_settings',
+            'name' => 'vt_gtm_enable_ga4',
+            'type' => 'bool',
+            'value' => true,
+            'position' => 1
+        ],
+        [
+            'group' => 'vt_gtm_settings',
+            'name' => 'vt_gtm_enable_ua',
+            'type' => 'bool',
+            'value' => true,
+            'position' => 2
+        ],
+        [
+            'group' => 'vt_gtm_settings',
+            'name' => 'vt_gtm_mpapisecret',
+            'type' => 'str',
+            'value' => '',
+            'position' => 3
+        ],
+        [
+            'group' => 'vt_gtm_settings',
+            'name' => 'vt_gtm_promotionlistids',
+            'type' => 'arr',
+            'value' => [],
+            'position' => 4
+        ]
+    ]
+];
\ No newline at end of file