diff --git a/src/DBtree.php b/src/Tree/DBtree.php
similarity index 99%
rename from src/DBtree.php
rename to src/Tree/DBtree.php
index 1a5792f..6a19b89 100644
--- a/src/DBtree.php
+++ b/src/Tree/DBtree.php
@@ -119,7 +119,7 @@ class Tree_DBTree
     //					'right' => 'cat_right',
     //					'level' => 'cat_level'
     //				 )    
-    function CDBTree(&$DB, $tableName, $itemId, $seq, $fieldNames = array()) 
+    function __construct(&$DB, $tableName, $itemId, $seq, $fieldNames = array()) 
     {
         
         if (empty($tableName)) trigger_error("phpDbTree: Unknown table", E_USER_ERROR);
diff --git a/src/Database.php b/src/Tree/Database.php
similarity index 97%
rename from src/Database.php
rename to src/Tree/Database.php
index 9c29f18..bc398f6 100644
--- a/src/Database.php
+++ b/src/Tree/Database.php
@@ -21,7 +21,7 @@ class Tree_Database
     var $db;
     var $host, $user, $pass;
     
-    function CDatabase($db, $host = "localhost", $user = "", $pass = "") 
+    function __construct($db, $host = "localhost", $user = "", $pass = "") 
     {
         $this->db = $db;
         $this->host = $host;
diff --git a/src/Sort.php b/src/Tree/Sort.php
similarity index 100%
rename from src/Sort.php
rename to src/Tree/Sort.php