diff --git a/Assets.php b/AssetBundle.php
similarity index 55%
rename from Assets.php
rename to AssetBundle.php
index 6583c1a..894cc38 100644
--- a/Assets.php
+++ b/AssetBundle.php
@@ -8,12 +8,10 @@
 
 namespace apollo11\yii2GaOptOut;
 
-use yii\web\AssetBundle;
-
-class Assets extends AssetBundle
+class AssetBundle extends \yii\web\AssetBundle
 {
-    public $sourcePath ='@npm-assets/gaopout';
-    public $js=[
+    public $sourcePath = '@npm/gaoptout';
+    public $js = [
         'ApGaOptOut.js'
     ];
 }
\ No newline at end of file
diff --git a/GaOpOut.php b/GaOpOut.php
new file mode 100644
index 0000000..aee6fcf
--- /dev/null
+++ b/GaOpOut.php
@@ -0,0 +1,48 @@
+<?php
+/**
+ * Created by PhpStorm.
+ * User: levani
+ * Date: 1/8/19
+ * Time: 1:39 PM
+ */
+
+namespace apollo11\yii2GaOptOut;
+
+use yii\base\Widget;
+
+
+class GaOpOut extends Widget
+{
+    // view
+    public $view;
+
+    //gap Id
+    public $gaAppId;
+
+    //output call event
+    public $optOutCallEvent = 'click';
+
+    //element selector with link to jsoutput
+    public $elementSelector = '[href="#jsgaoptout"]';
+
+    /**
+     * @var bool
+     */
+    public $debug = false;
+
+    public $showAlterAfterDeactivate = true;
+
+    public function init()
+    {
+        AssetBundle::register($this->getView());
+        $this->getView()->registerJs("
+            new ApGaOptOut({
+                gaAppId: '{$this->gaAppId}',
+                optOutCallEvent: '{$this->optOutCallEvent}',
+                elementSelector: '{$this->elementSelector}',
+                debug: " . ($this->debug ? 'true' : 'false') . ",
+                showAlterAfterDeactivate: " . ($this->showAlterAfterDeactivate ? 'true' : 'false') . "
+            });
+        ");
+    }
+}
\ No newline at end of file
diff --git a/gaOpOut.php b/gaOpOut.php
deleted file mode 100644
index f7146a7..0000000
--- a/gaOpOut.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * Created by PhpStorm.
- * User: levani
- * Date: 1/8/19
- * Time: 1:39 PM
- */
-
-namespace apollo11\yii2GaOptOut;
-
-
-class gaOpOut
-{
-    // view
-    public $view;
-    //gap Id
-    public $gaAppId;
-    //output call event
-    public $optOutCallEvent = 'click';
-    //element selector with link to jsoutput
-    public $elementSelector = '[href="#jsgaoptout"]';
-    //Debug default false
-    public $debug = false;
-
-    public $showAlterAfterDeactivate = true;
-
-    public function registerGaOpOut($view, $gaAppId, $optOutCallEvent, $elementSelector, $debug, $showAlterAfterDeactivate)
-    {
-        Assets::register($view);
-        $view->registerJs("
-    <script>
-        (function() {
-            window.onload = function () {
-                var gaOptOut = new ApGaOptOut({
-                    gaAppId: $gaAppId,
-                    optOutCallEvent: $optOutCallEvent,
-                    elementSelector: $elementSelector,
-                    debug: $debug,
-                    showAlterAfterDeactivate: $showAlterAfterDeactivate
-                });
-            }
-        })();
-    </script>");
-    }
-}
\ No newline at end of file