diff --git a/site/_config/extensions.yml b/site/_config/extensions.yml
index ed10c37..bb66b4e 100755
--- a/site/_config/extensions.yml
+++ b/site/_config/extensions.yml
@@ -1,3 +1,3 @@
 SilverStripe\SiteConfig\SiteConfig:
   extensions:
-    - SiteConfigExtension
\ No newline at end of file
+    - Site\Extensions\SiteConfigExtension
\ No newline at end of file
diff --git a/site/_config/webpack.yml b/site/_config/webpack.yml
index ebd4db5..d94c9d3 100644
--- a/site/_config/webpack.yml
+++ b/site/_config/webpack.yml
@@ -2,7 +2,7 @@
 # with all configuration variables presented
 # Cuz WebPack compiling script use it to set configuration
 
-WebpackTemplateProvider:
+Site\Templates\WebpackTemplateProvider:
   SRC: site/client/src
   DIST: site/client/dist
   HOSTNAME: localhost
diff --git a/site/src/extensions/SiteConfigExtension.php b/site/src/Extensions/SiteConfigExtension.php
similarity index 97%
rename from site/src/extensions/SiteConfigExtension.php
rename to site/src/Extensions/SiteConfigExtension.php
index 85e82da..6e13379 100755
--- a/site/src/extensions/SiteConfigExtension.php
+++ b/site/src/Extensions/SiteConfigExtension.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Site\Extensions;
+
 use SilverStripe\ORM\DataExtension;
 use SilverStripe\CMS\Model\SiteTree;
 use SilverStripe\Forms\FieldList;
diff --git a/site/src/pages/HomePage.php b/site/src/Pages/HomePage.php
similarity index 54%
rename from site/src/pages/HomePage.php
rename to site/src/Pages/HomePage.php
index f3e425a..5d334bd 100755
--- a/site/src/pages/HomePage.php
+++ b/site/src/Pages/HomePage.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Site\Pages;
+use Page;
+
 class HomePage extends Page
 {
 }
diff --git a/site/src/pages/HomePageController.php b/site/src/Pages/HomePageController.php
similarity index 57%
rename from site/src/pages/HomePageController.php
rename to site/src/Pages/HomePageController.php
index cec0fef..f1735bd 100755
--- a/site/src/pages/HomePageController.php
+++ b/site/src/Pages/HomePageController.php
@@ -1,5 +1,8 @@
 <?php
 
+namespace Site\Pages;
+use PageController;
+
 class HomePageController extends PageController
 {
 }
diff --git a/site/src/Pages/Page.php b/site/src/Pages/Page.php
new file mode 100755
index 0000000..7cae93c
--- /dev/null
+++ b/site/src/Pages/Page.php
@@ -0,0 +1,11 @@
+<?php
+
+// vendor/silverstripe/errorpage/src/ErrorPage.php
+// extends global Page class
+//namespace Site\Pages;
+
+use SilverStripe\CMS\Model\SiteTree;
+
+class Page extends SiteTree
+{
+}
diff --git a/site/src/Pages/PageController.php b/site/src/Pages/PageController.php
new file mode 100755
index 0000000..fe89680
--- /dev/null
+++ b/site/src/Pages/PageController.php
@@ -0,0 +1,11 @@
+<?php
+
+// vendor/silverstripe/errorpage/src/ErrorPageController.php
+// extends global PageController class
+//namespace Site\Pages;
+
+use SilverStripe\CMS\Controllers\ContentController;
+
+class PageController extends ContentController
+{
+}
diff --git a/site/src/pages/Page.php b/site/src/pages/Page.php
deleted file mode 100755
index b4e2cce..0000000
--- a/site/src/pages/Page.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-use SilverStripe\CMS\Model\SiteTree;
-
-class Page extends SiteTree
-{
-}
diff --git a/site/src/pages/PageController.php b/site/src/pages/PageController.php
deleted file mode 100755
index 0745ea6..0000000
--- a/site/src/pages/PageController.php
+++ /dev/null
@@ -1,7 +0,0 @@
-<?php
-
-use SilverStripe\CMS\Controllers\ContentController;
-
-class PageController extends ContentController
-{
-}
diff --git a/site/src/templates/DeferedRequirements.php b/site/src/templates/DeferedRequirements.php
index 366f230..ade3984 100755
--- a/site/src/templates/DeferedRequirements.php
+++ b/site/src/templates/DeferedRequirements.php
@@ -1,5 +1,7 @@
 <?php
 
+namespace Site\Templates;
+
 use SilverStripe\View\TemplateGlobalProvider;
 use SilverStripe\View\Requirements;
 use SilverStripe\Core\Config\Config;
diff --git a/site/src/templates/WebpackTemplateProvider.php b/site/src/templates/WebpackTemplateProvider.php
index b2d952e..a264926 100755
--- a/site/src/templates/WebpackTemplateProvider.php
+++ b/site/src/templates/WebpackTemplateProvider.php
@@ -4,6 +4,8 @@
  * Directs assets requests to Webpack server or to static files
 */
 
+namespace Site\Templates;
+
 use SilverStripe\View\TemplateGlobalProvider;
 use SilverStripe\View\Requirements;
 use SilverStripe\Control\Director;
diff --git a/webpack.configuration.js b/webpack.configuration.js
index fc526f4..14d3cad 100755
--- a/webpack.configuration.js
+++ b/webpack.configuration.js
@@ -2,9 +2,9 @@
  * Load webpack configuration from site/_config/webpack.yml
  */
 
-const path = require("path");
-const fs = require("fs");
-const yaml = require("js-yaml");
-const conf = yaml.safeLoad(fs.readFileSync(path.join(__dirname, "site/_config/webpack.yml"), "utf8"));
+const path = require('path');
+const fs = require('fs');
+const yaml = require('js-yaml');
+const conf = yaml.safeLoad(fs.readFileSync(path.join(__dirname, 'site/_config/webpack.yml'), 'utf8'));
 
-module.exports = conf.WebpackTemplateProvider;
\ No newline at end of file
+module.exports = conf['Site\\Templates\\WebpackTemplateProvider'];
\ No newline at end of file