diff --git a/src/adapter.php b/src/Adapter.php
similarity index 100%
rename from src/adapter.php
rename to src/Adapter.php
diff --git a/src/arr.php b/src/Arr.php
similarity index 100%
rename from src/arr.php
rename to src/Arr.php
diff --git a/src/collection.php b/src/Collection.php
similarity index 100%
rename from src/collection.php
rename to src/Collection.php
diff --git a/src/connection/httpconnection.php b/src/Connection/HttpConnection.php
similarity index 100%
rename from src/connection/httpconnection.php
rename to src/Connection/HttpConnection.php
diff --git a/src/connection/httpconnectionresponse.php b/src/Connection/HttpConnectionResponse.php
similarity index 100%
rename from src/connection/httpconnectionresponse.php
rename to src/Connection/HttpConnectionResponse.php
diff --git a/src/connection/idna_convert.php b/src/Connection/idna_convert.php
similarity index 100%
rename from src/connection/idna_convert.php
rename to src/Connection/idna_convert.php
diff --git a/src/controller/action.php b/src/Controller/Action.php
similarity index 100%
rename from src/controller/action.php
rename to src/Controller/Action.php
diff --git a/src/controller/component.php b/src/Controller/Component.php
similarity index 100%
rename from src/controller/component.php
rename to src/Controller/Component.php
diff --git a/src/controller/front.php b/src/Controller/Front.php
similarity index 100%
rename from src/controller/front.php
rename to src/Controller/Front.php
diff --git a/src/controller/installer.php b/src/Controller/Installer.php
similarity index 100%
rename from src/controller/installer.php
rename to src/Controller/Installer.php
diff --git a/src/controller/model.php b/src/Controller/Model.php
similarity index 100%
rename from src/controller/model.php
rename to src/Controller/Model.php
diff --git a/src/controller/state.php b/src/Controller/State.php
similarity index 100%
rename from src/controller/state.php
rename to src/Controller/State.php
diff --git a/src/database.php b/src/Database.php
similarity index 100%
rename from src/database.php
rename to src/Database.php
diff --git a/src/error.php b/src/Error.php
similarity index 100%
rename from src/error.php
rename to src/Error.php
diff --git a/src/file.php b/src/File.php
similarity index 100%
rename from src/file.php
rename to src/File.php
diff --git a/src/filter/actionaccess.php b/src/Filter/ActionAccess.php
similarity index 100%
rename from src/filter/actionaccess.php
rename to src/Filter/ActionAccess.php
diff --git a/src/filter/actionlogger.php b/src/Filter/ActionLogger.php
similarity index 100%
rename from src/filter/actionlogger.php
rename to src/Filter/ActionLogger.php
diff --git a/src/filter/filter.php b/src/Filter/Filter.php
similarity index 100%
rename from src/filter/filter.php
rename to src/Filter/Filter.php
diff --git a/src/filter/login.php b/src/Filter/Login.php
similarity index 100%
rename from src/filter/login.php
rename to src/Filter/Login.php
diff --git a/src/filter/useraccess.php b/src/Filter/UserAccess.php
similarity index 100%
rename from src/filter/useraccess.php
rename to src/Filter/UserAccess.php
diff --git a/src/form/form.php b/src/Form/Form.php
similarity index 100%
rename from src/form/form.php
rename to src/Form/Form.php
diff --git a/src/form/viewstate.php b/src/Form/ViewState.php
similarity index 100%
rename from src/form/viewstate.php
rename to src/Form/ViewState.php
diff --git a/src/formats/dot.php b/src/Formats/Dot.php
similarity index 100%
rename from src/formats/dot.php
rename to src/Formats/Dot.php
diff --git a/src/formats/helix.php b/src/Formats/Helix.php
similarity index 100%
rename from src/formats/helix.php
rename to src/Formats/Helix.php
diff --git a/src/geometry/point.php b/src/Geometry/Point.php
similarity index 100%
rename from src/geometry/point.php
rename to src/Geometry/Point.php
diff --git a/src/geometry/rectangle.php b/src/Geometry/Rectangle.php
similarity index 100%
rename from src/geometry/rectangle.php
rename to src/Geometry/Rectangle.php
diff --git a/src/httprequest.php b/src/HttpRequest.php
similarity index 100%
rename from src/httprequest.php
rename to src/HttpRequest.php
diff --git a/src/layout/manager.php b/src/Layout/Manager.php
similarity index 100%
rename from src/layout/manager.php
rename to src/Layout/Manager.php
diff --git a/src/layout/none.php b/src/Layout/None.php
similarity index 100%
rename from src/layout/none.php
rename to src/Layout/None.php
diff --git a/src/mail.php b/src/Mail.php
similarity index 100%
rename from src/mail.php
rename to src/Mail.php
diff --git a/src/mapper/factory.php b/src/Mapper/Factory.php
similarity index 100%
rename from src/mapper/factory.php
rename to src/Mapper/Factory.php
diff --git a/src/mapper/mapper.php b/src/Mapper/Mapper.php
similarity index 100%
rename from src/mapper/mapper.php
rename to src/Mapper/Mapper.php
diff --git a/src/mapper/pathmapper.php b/src/Mapper/PathMapper.php
similarity index 100%
rename from src/mapper/pathmapper.php
rename to src/Mapper/PathMapper.php
diff --git a/src/markup/simplebbcode.php b/src/Markup/SimpleBBCode.php
similarity index 100%
rename from src/markup/simplebbcode.php
rename to src/Markup/SimpleBBCode.php
diff --git a/src/numbers.php b/src/Numbers.php
similarity index 100%
rename from src/numbers.php
rename to src/Numbers.php
diff --git a/src/path.php b/src/Path.php
similarity index 100%
rename from src/path.php
rename to src/Path.php
diff --git a/src/primitive.php b/src/Primitive.php
similarity index 100%
rename from src/primitive.php
rename to src/Primitive.php
diff --git a/src/query/meta.php b/src/Query/meta.php
similarity index 100%
rename from src/query/meta.php
rename to src/Query/meta.php
diff --git a/src/query/query.php b/src/Query/query.php
similarity index 100%
rename from src/query/query.php
rename to src/Query/query.php
diff --git a/src/query/table.php b/src/Query/table.php
similarity index 100%
rename from src/query/table.php
rename to src/Query/table.php
diff --git a/src/registry.php b/src/Registry.php
similarity index 100%
rename from src/registry.php
rename to src/Registry.php
diff --git a/src/search/htmlhelper.php b/src/Search/htmlhelper.php
similarity index 100%
rename from src/search/htmlhelper.php
rename to src/Search/htmlhelper.php
diff --git a/src/search/index.php b/src/Search/index.php
similarity index 100%
rename from src/search/index.php
rename to src/Search/index.php
diff --git a/src/search/lexer.php b/src/Search/lexer.php
similarity index 100%
rename from src/search/lexer.php
rename to src/Search/lexer.php
diff --git a/src/search/search.php b/src/Search/search.php
similarity index 100%
rename from src/search/search.php
rename to src/Search/search.php
diff --git a/src/search/searcher.php b/src/Search/searcher.php
similarity index 100%
rename from src/search/searcher.php
rename to src/Search/searcher.php
diff --git a/src/search/stemmer.php b/src/Search/stemmer.php
similarity index 100%
rename from src/search/stemmer.php
rename to src/Search/stemmer.php
diff --git a/src/session.php b/src/Session.php
similarity index 100%
rename from src/session.php
rename to src/Session.php
diff --git a/src/settings.php b/src/Settings.php
similarity index 100%
rename from src/settings.php
rename to src/Settings.php
diff --git a/src/setup.php b/src/Setup.php
similarity index 100%
rename from src/setup.php
rename to src/Setup.php
diff --git a/src/shortcut.php b/src/Shortcut.php
similarity index 100%
rename from src/shortcut.php
rename to src/Shortcut.php
diff --git a/src/sort.php b/src/Sort.php
similarity index 100%
rename from src/sort.php
rename to src/Sort.php
diff --git a/src/spell.php b/src/Spell.php
similarity index 100%
rename from src/spell.php
rename to src/Spell.php
diff --git a/src/tools/drawing.php b/src/Tools/Drawing.php
similarity index 100%
rename from src/tools/drawing.php
rename to src/Tools/Drawing.php
diff --git a/src/tools/exceltable.php b/src/Tools/ExcelTable.php
similarity index 100%
rename from src/tools/exceltable.php
rename to src/Tools/ExcelTable.php
diff --git a/src/tools/image.php b/src/Tools/Image.php
similarity index 100%
rename from src/tools/image.php
rename to src/Tools/Image.php
diff --git a/src/tools/password.php b/src/Tools/Password.php
similarity index 100%
rename from src/tools/password.php
rename to src/Tools/Password.php
diff --git a/src/tools/string.php b/src/Tools/String.php
similarity index 100%
rename from src/tools/string.php
rename to src/Tools/String.php
diff --git a/src/tools/tableview.php b/src/Tools/TableView.php
similarity index 100%
rename from src/tools/tableview.php
rename to src/Tools/TableView.php
diff --git a/src/tools/templateimage.php b/src/Tools/TemplateImage.php
similarity index 100%
rename from src/tools/templateimage.php
rename to src/Tools/TemplateImage.php
diff --git a/src/tools/translit.php b/src/Tools/Translit.php
similarity index 100%
rename from src/tools/translit.php
rename to src/Tools/Translit.php
diff --git a/src/tree/dbtree.php b/src/Tree/DBtree.php
similarity index 100%
rename from src/tree/dbtree.php
rename to src/Tree/DBtree.php
diff --git a/src/tree/database.php b/src/Tree/Database.php
similarity index 100%
rename from src/tree/database.php
rename to src/Tree/Database.php
diff --git a/src/tree/sort.php b/src/Tree/Sort.php
similarity index 100%
rename from src/tree/sort.php
rename to src/Tree/Sort.php
diff --git a/src/validator/rule/abstract.php b/src/Validator/Rule/Abstract.php
similarity index 95%
rename from src/validator/rule/abstract.php
rename to src/Validator/Rule/Abstract.php
index 06189ec..cc5548f 100644
--- a/src/validator/rule/abstract.php
+++ b/src/Validator/Rule/Abstract.php
@@ -1,6 +1,6 @@
 <?php
 
-abstract class Rule_Abstract
+abstract class Validator_Rule_Abstract
 {
     public $field;
     protected $errorMsg;
diff --git a/src/validator/rule/alpha.php b/src/Validator/Rule/Alpha.php
similarity index 82%
rename from src/validator/rule/alpha.php
rename to src/Validator/Rule/Alpha.php
index fc8f39d..02b422e 100644
--- a/src/validator/rule/alpha.php
+++ b/src/Validator/Rule/Alpha.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка на число
  */
-class Rule_Alpha extends Rule_Abstract
+class Validator_Rule_Alpha extends Rule_Abstract
 {
     public function getErrorMsg()
     { 
diff --git a/src/validator/rule/code.php b/src/Validator/Rule/Code.php
similarity index 96%
rename from src/validator/rule/code.php
rename to src/Validator/Rule/Code.php
index 8126cd8..54514e2 100644
--- a/src/validator/rule/code.php
+++ b/src/Validator/Rule/Code.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата электронной почты
  */
-class Rule_Code extends Rule_Abstract
+class Validator_Rule_Code extends Rule_Abstract
 {
     public function getErrorMsg()
     { 
diff --git a/src/validator/rule/count.php b/src/Validator/Rule/Count.php
similarity index 91%
rename from src/validator/rule/count.php
rename to src/Validator/Rule/Count.php
index e7c8145..f8c1800 100644
--- a/src/validator/rule/count.php
+++ b/src/Validator/Rule/Count.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата даты
  */
-class Rule_Count extends Rule_Abstract
+class Validator_Rule_Count extends Rule_Abstract
 {
     public $size = 1;
     public $max = false;
diff --git a/src/validator/rule/date.php b/src/Validator/Rule/Date.php
similarity index 87%
rename from src/validator/rule/date.php
rename to src/Validator/Rule/Date.php
index b8b3fe8..8b40b4d 100644
--- a/src/validator/rule/date.php
+++ b/src/Validator/Rule/Date.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата даты
  */
-class Rule_Date extends Rule_Abstract
+class Validator_Rule_Date extends Rule_Abstract
 {
     private $split = "\\/";
 
diff --git a/src/validator/rule/email.php b/src/Validator/Rule/Email.php
similarity index 92%
rename from src/validator/rule/email.php
rename to src/Validator/Rule/Email.php
index f0048b2..e40486a 100644
--- a/src/validator/rule/email.php
+++ b/src/Validator/Rule/Email.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата электронной почты
  */
-class Rule_Email extends Rule_Abstract
+class Validator_Rule_Email extends Rule_Abstract
 {
     public function getErrorMsg()
     { 
diff --git a/src/validator/rule/emaillist.php b/src/Validator/Rule/EmailList.php
similarity index 92%
rename from src/validator/rule/emaillist.php
rename to src/Validator/Rule/EmailList.php
index 39599c4..16bdd50 100644
--- a/src/validator/rule/emaillist.php
+++ b/src/Validator/Rule/EmailList.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата электронной почты
  */
-class Rule_EmailList extends Rule_Abstract
+class Validator_Rule_EmailList extends Rule_Abstract
 {
     public function getErrorMsg()
     { 
diff --git a/src/validator/rule/isfile.php b/src/Validator/Rule/IsFile.php
similarity index 94%
rename from src/validator/rule/isfile.php
rename to src/Validator/Rule/IsFile.php
index a2385ad..c19cf12 100644
--- a/src/validator/rule/isfile.php
+++ b/src/Validator/Rule/IsFile.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата времени
  */
-class Rule_IsFile extends Rule_Abstract
+class Validator_Rule_IsFile extends Rule_Abstract
 {
     private $type = array();
     private $maxsize = 1024;
diff --git a/src/validator/rule/match.php b/src/Validator/Rule/Match.php
similarity index 88%
rename from src/validator/rule/match.php
rename to src/Validator/Rule/Match.php
index 5d6804d..c3fdcdf 100644
--- a/src/validator/rule/match.php
+++ b/src/Validator/Rule/Match.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка на равентство двух полей
  */
-class Rule_Match extends Rule_Abstract
+class Validator_Rule_Match extends Rule_Abstract
 {
     public $same;
 
diff --git a/src/validator/rule/notnull.php b/src/Validator/Rule/Notnull.php
similarity index 88%
rename from src/validator/rule/notnull.php
rename to src/Validator/Rule/Notnull.php
index 8a2170e..a3f27f2 100644
--- a/src/validator/rule/notnull.php
+++ b/src/Validator/Rule/Notnull.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once 'abstract.php';
-
-class Rule_Notnull extends Rule_Abstract
+class Validator_Rule_Notnull extends Rule_Abstract
 {
     function skipEmpty() {
         return false;
diff --git a/src/validator/rule/numeric.php b/src/Validator/Rule/Numeric.php
similarity index 81%
rename from src/validator/rule/numeric.php
rename to src/Validator/Rule/Numeric.php
index 2d9a945..86b2bc2 100644
--- a/src/validator/rule/numeric.php
+++ b/src/Validator/Rule/Numeric.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка на число
  */
-class Rule_Numeric extends Rule_Abstract
+class Validator_Rule_Numeric extends Rule_Abstract
 {
     public function getErrorMsg()
     { 
diff --git a/src/validator/rule/time.php b/src/Validator/Rule/Time.php
similarity index 90%
rename from src/validator/rule/time.php
rename to src/Validator/Rule/Time.php
index c97c49c..b343a84 100644
--- a/src/validator/rule/time.php
+++ b/src/Validator/Rule/Time.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата времени
  */
-class Rule_Time extends Rule_Abstract
+class Validator_Rule_Time extends Rule_Abstract
 {
     private $split = ":";
 
diff --git a/src/validator/rule/unique.php b/src/Validator/Rule/Unique.php
similarity index 81%
rename from src/validator/rule/unique.php
rename to src/Validator/Rule/Unique.php
index 9fe6e03..fe97a07 100644
--- a/src/validator/rule/unique.php
+++ b/src/Validator/Rule/Unique.php
@@ -1,11 +1,9 @@
 <?php
 
-require_once 'abstract.php';
-
 /**
  * Проверка формата времени
  */
-class Rule_Unique extends Rule_Abstract
+class Validator_Rule_Unique extends Rule_Abstract
 {
     public function getErrorMsg()
     {
diff --git a/src/validator/validator.php b/src/Validator/Validator.php
similarity index 85%
rename from src/validator/validator.php
rename to src/Validator/Validator.php
index 4aa9d7f..4e0be40 100644
--- a/src/validator/validator.php
+++ b/src/Validator/Validator.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once "core/validator/rule/all.php";
-
 /**
  * Проверка коллекции 
  */
@@ -23,18 +21,18 @@ class Validator
     public function addRuleList(array $input)
     {
         $type = array(
-            'date'     => 'Rule_Date',
-            'email'    => 'Rule_Email',
-            'emaillist'=> 'Rule_EmailList',
-            'match'    => 'Rule_Match',
-            'time'     => 'Rule_Time',
-            'alpha'    => 'Rule_Alpha',
-            'require'  => 'Rule_Notnull',
-            'numeric'  => 'Rule_Numeric',
-            'unique'   => 'Rule_Unique',
-            'count'    => 'Rule_Count',
-            'isfile'  => 'Rule_IsFile',
-            'code'    => 'Rule_Code'
+            'date'     => 'Validator_Rule_Date',
+            'email'    => 'Validator_Rule_Email',
+            'emaillist'=> 'Validator_Rule_EmailList',
+            'match'    => 'Validator_Rule_Match',
+            'time'     => 'Validator_Rule_Time',
+            'alpha'    => 'Validator_Rule_Alpha',
+            'require'  => 'Validator_Rule_Notnull',
+            'numeric'  => 'Validator_Rule_Numeric',
+            'unique'   => 'Validator_Rule_Unique',
+            'count'    => 'Validator_Rule_Count',
+            'isfile'  => 'Validator_Rule_IsFile',
+            'code'    => 'Validator_Rule_Code'
         );
 
         // Разбор правила проверки
diff --git a/src/view/composite.php b/src/View/Composite.php
similarity index 100%
rename from src/view/composite.php
rename to src/View/Composite.php
diff --git a/src/view/top.php b/src/View/Top.php
similarity index 100%
rename from src/view/top.php
rename to src/View/Top.php
diff --git a/src/view/view.php b/src/View/View.php
similarity index 100%
rename from src/view/view.php
rename to src/View/View.php
diff --git a/src/zipfile.php b/src/ZipFile.php
similarity index 100%
rename from src/zipfile.php
rename to src/ZipFile.php
diff --git a/src/validator/rule/all.php b/src/validator/rule/all.php
deleted file mode 100644
index 47006d7..0000000
--- a/src/validator/rule/all.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-foreach (glob(dirname(__FILE__) . "/*.php") as $file) { require_once $file; }