diff --git a/CHANGELOG.md b/CHANGELOG.md
index 067f04f..9faaefc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 CHANGELOG
 ==============
+
+2.2.0
+-----------------
+ * Pgsql support
+ 
 2.1.0
 -----------------
  * Using composer-config-plugin
diff --git a/composer.json b/composer.json
index af66172..7a65872 100644
--- a/composer.json
+++ b/composer.json
@@ -17,17 +17,17 @@
         }
     ],
     "require": {
-        "skeeks/cms": "*"
+        "skeeks/cms": "~5.0 || dev-master"
     },
     "autoload": {
         "psr-4": {
-            "skeeks\\cms\\measure\\": ""
+            "skeeks\\cms\\measure\\": "src"
         }
     },
     "extra": {
         "config-plugin": {
-            "web": "config/main.php",
-            "console": "config/main-console.php"
+            "web": "src/config/main.php",
+            "console": "src/config/main-console.php"
         }
     }
 }
diff --git a/Module.php b/src/Module.php
similarity index 100%
rename from Module.php
rename to src/Module.php
diff --git a/_ide/YiiApplication.php b/src/_ide/YiiApplication.php
similarity index 100%
rename from _ide/YiiApplication.php
rename to src/_ide/YiiApplication.php
diff --git a/assets/Asset.php b/src/assets/Asset.php
similarity index 100%
rename from assets/Asset.php
rename to src/assets/Asset.php
diff --git a/assets/icons/misc.png b/src/assets/icons/misc.png
similarity index 100%
rename from assets/icons/misc.png
rename to src/assets/icons/misc.png
diff --git a/components/MeasureComponent.php b/src/components/MeasureComponent.php
similarity index 100%
rename from components/MeasureComponent.php
rename to src/components/MeasureComponent.php
diff --git a/config/admin/menu.php b/src/config/admin/menu.php
similarity index 100%
rename from config/admin/menu.php
rename to src/config/admin/menu.php
diff --git a/config/main-console.php b/src/config/main-console.php
similarity index 100%
rename from config/main-console.php
rename to src/config/main-console.php
diff --git a/config/main.php b/src/config/main.php
similarity index 100%
rename from config/main.php
rename to src/config/main.php
diff --git a/controllers/AdminMeasureController.php b/src/controllers/AdminMeasureController.php
similarity index 100%
rename from controllers/AdminMeasureController.php
rename to src/controllers/AdminMeasureController.php
diff --git a/libs/Loc.php b/src/libs/Loc.php
similarity index 100%
rename from libs/Loc.php
rename to src/libs/Loc.php
diff --git a/libs/MeasureClassifier.php b/src/libs/MeasureClassifier.php
similarity index 100%
rename from libs/MeasureClassifier.php
rename to src/libs/MeasureClassifier.php
diff --git a/libs/langs/en.php b/src/libs/langs/en.php
similarity index 100%
rename from libs/langs/en.php
rename to src/libs/langs/en.php
diff --git a/libs/langs/ru.php b/src/libs/langs/ru.php
similarity index 100%
rename from libs/langs/ru.php
rename to src/libs/langs/ru.php
diff --git a/messages/ru/main.php b/src/messages/ru/main.php
similarity index 100%
rename from messages/ru/main.php
rename to src/messages/ru/main.php
diff --git a/migrations/m150911_170601_create_table__measure.php b/src/migrations/m150911_170601_create_table__measure.php
similarity index 80%
rename from migrations/m150911_170601_create_table__measure.php
rename to src/migrations/m150911_170601_create_table__measure.php
index 3f37494..55d7031 100644
--- a/migrations/m150911_170601_create_table__measure.php
+++ b/src/migrations/m150911_170601_create_table__measure.php
@@ -46,18 +46,16 @@ public function safeUp()
         ], $tableOptions);
 
 
-        $this->createIndex('updated_by', '{{%measure}}', 'updated_by');
-        $this->createIndex('created_by', '{{%measure}}', 'created_by');
-        $this->createIndex('created_at', '{{%measure}}', 'created_at');
-        $this->createIndex('updated_at', '{{%measure}}', 'updated_at');
-
-        $this->createIndex('name', '{{%measure}}', 'name');
-        $this->createIndex('symbol_rus', '{{%measure}}', 'symbol_rus');
-        $this->createIndex('symbol_intl', '{{%measure}}', 'symbol_intl');
-        $this->createIndex('symbol_letter_intl', '{{%measure}}', 'symbol_letter_intl');
-        $this->createIndex('def', '{{%measure}}', 'def');
-
-        $this->execute("ALTER TABLE {{%measure}} COMMENT = 'Единицы измерения';");
+        $this->createIndex('measure__updated_by', '{{%measure}}', 'updated_by');
+        $this->createIndex('measure__created_by', '{{%measure}}', 'created_by');
+        $this->createIndex('measure__created_at', '{{%measure}}', 'created_at');
+        $this->createIndex('measure__updated_at', '{{%measure}}', 'updated_at');
+
+        $this->createIndex('measure__name', '{{%measure}}', 'name');
+        $this->createIndex('measure__symbol_rus', '{{%measure}}', 'symbol_rus');
+        $this->createIndex('measure__symbol_intl', '{{%measure}}', 'symbol_intl');
+        $this->createIndex('measure__symbol_letter_intl', '{{%measure}}', 'symbol_letter_intl');
+        $this->createIndex('measure__def', '{{%measure}}', 'def');
 
         $this->addForeignKey(
             'measure_created_by', "{{%measure}}",
diff --git a/models/Measure.php b/src/models/Measure.php
similarity index 100%
rename from models/Measure.php
rename to src/models/Measure.php
diff --git a/views/admin-measure/_form.php b/src/views/admin-measure/_form.php
similarity index 100%
rename from views/admin-measure/_form.php
rename to src/views/admin-measure/_form.php