diff --git a/src/Filter/ActionAccess.php b/src/Filter/ActionAccess.php
index a44721b..7504a86 100644
--- a/src/Filter/ActionAccess.php
+++ b/src/Filter/ActionAccess.php
@@ -3,7 +3,7 @@
 /**
  * Фильтр действий 
  */
-class ActionAccess
+class Filter_ActionAccess
 {
     public $access = array();
 
diff --git a/src/Filter/ActionLogger.php b/src/Filter/ActionLogger.php
index c92d37c..2d6c395 100644
--- a/src/Filter/ActionLogger.php
+++ b/src/Filter/ActionLogger.php
@@ -1,6 +1,6 @@
 <?php
 
-class ActionLogger
+class Filter_ActionLogger
 {   
     public $before = array ();
     public $file;
diff --git a/src/Form/Form.php b/src/Form/Form.php
index 179d33e..7d38691 100644
--- a/src/Form/Form.php
+++ b/src/Form/Form.php
@@ -95,7 +95,7 @@ class TUpload extends TField
  * Форма для ввода
  * @package core
  */
-class TForm
+class Form_Form
 {
     public $field = array ();
     public $action = "";
diff --git a/src/Formats/Dot.php b/src/Formats/Dot.php
index 3c57d3b..83f71dd 100644
--- a/src/Formats/Dot.php
+++ b/src/Formats/Dot.php
@@ -3,7 +3,7 @@
 /**
  * Генерация файлов Grpahviz dot
  */
-class Dot
+class Formats_Dot
 {
     static function getHeader ()
     {
@@ -48,5 +48,3 @@ class Dot
         return implode("", $result);
     }
 }
-
-?>
\ No newline at end of file
diff --git a/src/Geometry/Point.php b/src/Geometry/Point.php
index 61254e6..0e11934 100644
--- a/src/Geometry/Point.php
+++ b/src/Geometry/Point.php
@@ -1,6 +1,6 @@
 <?php
 
-class Point
+class Geometry_Point
 {
     public $left, $top;
     function __construct ($left = 0, $top = 0)
diff --git a/src/Geometry/Rectangle.php b/src/Geometry/Rectangle.php
index 4c7c0e0..80a9572 100644
--- a/src/Geometry/Rectangle.php
+++ b/src/Geometry/Rectangle.php
@@ -1,8 +1,6 @@
 <?php
 
-require_once "core/geometry/point.php";
-
-class Rectangle
+class Geometry_Rectangle
 {
     public $left, $top, $width, $height;
 
diff --git a/src/Mapper/Mapper.php b/src/Mapper/Mapper.php
index 07d30ba..5ce07dd 100644
--- a/src/Mapper/Mapper.php
+++ b/src/Mapper/Mapper.php
@@ -1,7 +1,5 @@
 <?php
 
-require_once 'core/primitive.php';
-
 /**
  * Использовать интерфейсы чтобы определить какие действия можно совершать с обьектом и таким образом 
  * Строить набор действий Action и отображений View для обьекта
diff --git a/src/Mapper/PathMapper.php b/src/Mapper/PathMapper.php
index 32d0a1f..2c70315 100644
--- a/src/Mapper/PathMapper.php
+++ b/src/Mapper/PathMapper.php
@@ -25,9 +25,6 @@ class PathMapper
 
     function findAll (Collection $request, $id = null)
     {
-        require_once "core/settings.php";
-        require_once "core/path.php";
-
         $this->reference = $id;
 
         $base = $this->basePath ();
@@ -75,4 +72,3 @@ class PathMapper
     }
 }
 
-?>
\ No newline at end of file
diff --git a/src/Query/query.php b/src/Query/query.php
index 3e4b395..e93e7e5 100644
--- a/src/Query/query.php
+++ b/src/Query/query.php
@@ -1,8 +1,5 @@
 <?php
 
-require_once 'table.php';
-require_once 'meta.php';
-
 /**
  * Класс для составления запроса
  */
diff --git a/src/Search/index.php b/src/Search/index.php
index 0d4cc9e..6f79c33 100644
--- a/src/Search/index.php
+++ b/src/Search/index.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'core/search/htmlhelper.php';
-require_once 'core/search/stemmer.php';
-require_once 'core/path.php';
-
 /**
  * Индексирование файлов
  */
diff --git a/src/Search/search.php b/src/Search/search.php
index d2b6266..718d8af 100644
--- a/src/Search/search.php
+++ b/src/Search/search.php
@@ -1,7 +1,6 @@
 <?php
 
-require_once 'core/search/lexer.php';
-require_once 'core/functions.php';
+require_once __DIR__ '/../functions.php';
 
 /**
  * Поиск в индексе
diff --git a/src/Search/searcher.php b/src/Search/searcher.php
index c320809..4bc92d7 100644
--- a/src/Search/searcher.php
+++ b/src/Search/searcher.php
@@ -1,9 +1,5 @@
 <?php
 
-require_once 'core/search/search.php';
-require_once 'core/search/htmlhelper.php';
-require_once 'core/search/stemmer.php';
-
 class Searcher {
     /*  protected */ public $index;
     protected $text;
diff --git a/src/Tools/String.php b/src/Tools/String.php
index 8708758..1745b25 100644
--- a/src/Tools/String.php
+++ b/src/Tools/String.php
@@ -1,37 +1,53 @@
 <?php
 
-// from creole
-function strToArray($str)
-{
-	$str = substr($str, 1, -1); // remove { }
-	$res = array();
-	
-	$subarr = array();
-	$in_subarr = 0;
-	
-	$toks = explode(',', $str);
-	foreach($toks as $tok) {					
-		if ($in_subarr > 0) { // already in sub-array?
-			$subarr[$in_subarr][] = $tok;
-			if ('}' === substr($tok, -1, 1)) { // check to see if we just added last component					
-				$res[] = $this->strToArray(implode(',', $subarr[$in_subarr]));
-				$in_subarr--;
-			}
-		} elseif ($tok{0} === '{') { // we're inside a new sub-array							   
-			if ('}' !== substr($tok, -1, 1)) {
-				$in_subarr++;
-				// if sub-array has more than one element
-				$subarr[$in_subarr] = array();
-				$subarr[$in_subarr][] = $tok;					
-			} else {
-				$res[] = $this->strToArray($tok);
-			}
-		} else { // not sub-array
-			$val = trim($tok, '"'); // remove " (surrounding strings)
-			// perform type castng here?
-			$res[] = $val;
-		}
-	}
-	
-	return $res;
+class Tools_String {
+    // from creole
+    static function strToArray($str)
+    {
+    	$str = substr($str, 1, -1); // remove { }
+    	$res = array();
+    	
+    	$subarr = array();
+    	$in_subarr = 0;
+	    
+    	$toks = explode(',', $str);
+    	foreach($toks as $tok) {					
+    		if ($in_subarr > 0) { // already in sub-array?
+    			$subarr[$in_subarr][] = $tok;
+	    		if ('}' === substr($tok, -1, 1)) { // check to see if we just added last component					
+    				$res[] = $this->strToArray(implode(',', $subarr[$in_subarr]));
+        				$in_subarr--;
+    			}
+    		} elseif ($tok{0} === '{') { // we're inside a new sub-array							   
+    			if ('}' !== substr($tok, -1, 1)) {
+    				$in_subarr++;
+    				// if sub-array has more than one element
+    				$subarr[$in_subarr] = array();
+    				$subarr[$in_subarr][] = $tok;					
+    			} else {
+    				$res[] = $this->strToArray($tok);
+    			}
+    		} else { // not sub-array
+    			$val = trim($tok, '"'); // remove " (surrounding strings)
+    			// perform type castng here?
+    			$res[] = $val;
+	    	}
+    	}
+    	
+    	return $res;
+    }
+
+
+    static function translit($st) {
+        $st = strtr($st,"абвгдеёзийклмнопрстуфхъыэ !№", "abvgdeeziyklmnoprstufh_ie__#");
+        $st = strtr($st,"АБВГДЕЁЗИЙКЛМНОПРСТУФХЪЫЭ", "ABVGDEEZIYKLMNOPRSTUFH_IE");
+        $st = strtr($st, array(
+                        "ж"=>"zh", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", 
+                        "щ"=>"shch","ь"=>"", "ю"=>"yu", "я"=>"ya",
+                        "Ж"=>"ZH", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH", 
+                        "Щ"=>"SHCH","Ь"=>"", "Ю"=>"YU", "Я"=>"YA",
+                        "ї"=>"i", "Ї"=>"Yi", "є"=>"ie", "Є"=>"Ye"
+                        ));
+        return $st;
+    }
 }
diff --git a/src/Tools/TemplateImage.php b/src/Tools/TemplateImage.php
index 8b03b4c..31bdfcc 100644
--- a/src/Tools/TemplateImage.php
+++ b/src/Tools/TemplateImage.php
@@ -3,7 +3,7 @@
 /**
  * Формат для композиции изображений
  */
-class TemplateImage
+class Tools_TemplateImage
 {
     static $listfiles = array('jpg' => 'jpeg', 'gif' => 'gif', 'png' => 'png', 'bmp' => 'wbmp');
     static $listfonts = array(
diff --git a/src/Tools/Translit.php b/src/Tools/Translit.php
deleted file mode 100644
index 1ca001c..0000000
--- a/src/Tools/Translit.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-function translit($st) {
-    $st = strtr($st,"абвгдеёзийклмнопрстуфхъыэ !№", "abvgdeeziyklmnoprstufh_ie__#");
-    $st = strtr($st,"АБВГДЕЁЗИЙКЛМНОПРСТУФХЪЫЭ", "ABVGDEEZIYKLMNOPRSTUFH_IE");
-    $st = strtr($st, array(
-                    "ж"=>"zh", "ц"=>"ts", "ч"=>"ch", "ш"=>"sh", 
-                    "щ"=>"shch","ь"=>"", "ю"=>"yu", "я"=>"ya",
-                    "Ж"=>"ZH", "Ц"=>"TS", "Ч"=>"CH", "Ш"=>"SH", 
-                    "Щ"=>"SHCH","Ь"=>"", "Ю"=>"YU", "Я"=>"YA",
-                    "ї"=>"i", "Ї"=>"Yi", "є"=>"ie", "Є"=>"Ye"
-                    ));
-    return $st;
-}
diff --git a/src/Tree/DBtree.php b/src/Tree/DBtree.php
index ad83ab3..1a5792f 100644
--- a/src/Tree/DBtree.php
+++ b/src/Tree/DBtree.php
@@ -86,7 +86,7 @@ function _inside($a, $x, $y) {
     return " " . $a . " > " . $x . " AND " . $a . " < " . $y;
 }
 
-class CDBTree
+class Tree_DBTree
 {
     var $db; // CDatabase class to plug to
     var $table; // Table with Nested Sets implemented
diff --git a/src/Tree/Database.php b/src/Tree/Database.php
index c9c8133..9c29f18 100644
--- a/src/Tree/Database.php
+++ b/src/Tree/Database.php
@@ -15,7 +15,7 @@
 // Note: For best viewing of the code Tab size 4 is recommended
 //****************************************************************************
 
-class CDatabase
+class Tree_Database
 {
     var $link;
     var $db;
diff --git a/src/Tree/Sort.php b/src/Tree/Sort.php
index cefd3e3..7cf4477 100644
--- a/src/Tree/Sort.php
+++ b/src/Tree/Sort.php
@@ -9,7 +9,7 @@
  *      $sort = new NestedSetSort();
  *      $data = $sort->sortBy($data, 'name');
  */
-class NestedSetSort {
+class Tree_Sort {
     private $data = array();
     private $result = array();
     private $sortBy = '';