diff --git a/css/bg.png b/css/bg.png
deleted file mode 100644
index 95907f6..0000000
Binary files a/css/bg.png and /dev/null differ
diff --git a/css/logo.png b/css/logo.png
deleted file mode 100644
index fabe842..0000000
Binary files a/css/logo.png and /dev/null differ
diff --git a/css/special.css b/css/special.css
deleted file mode 100644
index 442b06a..0000000
--- a/css/special.css
+++ /dev/null
@@ -1,83 +0,0 @@
-.Banner
-{
-
-}
-
-.logo
-{
-    width: 100%;
-    text-align: center;
-    margin-bottom: 20px;
-}
-
-.container#texts
-{
-    background: white;
-}
-
-#logo
-{
-    width: 180px;
-    float: left;
-    background: url(css/logo.png);
-    height: 65px;
-}
-.span4
-{
-    padding: 5px;
-    /*
-    border-left: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-    */
-    border: 1px solid #DDDDDD;
-    background: #EFEFEF;
-    margin-bottom: 15px;
-    margin-top: 15px;
-}
-
-.span4
-{
-    padding: 5px;
-    /*
-    border-left: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-    */
-    border: 1px solid #DDDDDD;
-    background: #FEFEFE;
-}
-
-.span12
-{
-    padding: 5px;
-    /*
-    border-left: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-    */
-    border: 1px solid #DDDDDD;
-    background: #EFEFEF;
-}
-
-.span12#bot
-{
-    padding: 5px;
-    /*
-    border-left: 1px solid #DDDDDD;
-    border-top: 1px solid #DDDDDD;
-    */
-    border: 1px solid #DDDDDD;
-    background: #FEFEFE;
-}
-#wrap
-{
-    padding-top: 60px;
-}
-.navbar
-{
-    background: #212121;
-    color: #EFEFEF;
-}
-
-.row-fluid
-{
-
-}
\ No newline at end of file
diff --git a/danube/autoload.inc.php b/danube/autoload.inc.php
index 5edfe8b..2e9a29e 100644
--- a/danube/autoload.inc.php
+++ b/danube/autoload.inc.php
@@ -2,4 +2,5 @@
 
 //keep this
 require_once dirname(__FILE__).'/path/register_path_classes.php';
-require_once dirname(__FILE__).'/page/register_page_classes.php';
\ No newline at end of file
+require_once dirname(__FILE__).'/page/register_page_classes.php';
+require_once dirname(__FILE__).'/dbd/autoload.inc.php';
\ No newline at end of file
diff --git a/dbd/autoload.inc.php b/danube/dbd/autoload.inc.php
similarity index 85%
rename from dbd/autoload.inc.php
rename to danube/dbd/autoload.inc.php
index 4d94296..d87380a 100644
--- a/dbd/autoload.inc.php
+++ b/danube/dbd/autoload.inc.php
@@ -4,7 +4,6 @@ $autoload = SYSTEM\autoload::getInstance();
 
 $autoload->registerFolder(dirname(__FILE__).'/db/','DBD');
 $autoload->registerFolder(dirname(__FILE__).'/tbl/','DBD');
-$autoload->registerFolder(dirname(__FILE__).'/tbl/system/','DBD\SYSTEM');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/definitions/','DBD\DEFINITIONS');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data/','DBD\DATA');
 //$autoload->registerFolder(dirname(__FILE__).'/tbl/data_processed/','DBD\DATA_PROCESSED');
\ No newline at end of file
diff --git a/dbd/db/unet.php b/danube/dbd/db/unet.php
similarity index 100%
rename from dbd/db/unet.php
rename to danube/dbd/db/unet.php
diff --git a/dbd/tbl/locale_string.php b/danube/dbd/tbl/locale_string.php
similarity index 100%
rename from dbd/tbl/locale_string.php
rename to danube/dbd/tbl/locale_string.php
diff --git a/danube/page/PageApi.php b/danube/page/PageApi.php
index 0f95ea5..e446c0f 100644
--- a/danube/page/PageApi.php
+++ b/danube/page/PageApi.php
@@ -23,11 +23,11 @@ class PageApi extends \SYSTEM\PAGE\PageClass {
     }
     
     public static function action_prices(){      
-        return new prices();
+        return new default_prices();
     }
     
     public static function action_contact(){      
-        return new contact();
+        return new default_contact();
     }
     
     public static function action_pic(){      
diff --git a/danube/page/contact/contact.php b/danube/page/contact/contact.php
deleted file mode 100644
index 9774854..0000000
--- a/danube/page/contact/contact.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<?php
-
-class contact extends SYSTEM\PAGE\Page {
-    public function html(){
-        $vars = array();                        
-        $vars['content'] = '';
-        
-        $vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
-        
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'contact/contact.tpl'), $vars);
-    }
-}
\ No newline at end of file
diff --git a/danube/page/contact/contact.html b/danube/page/default_contact/contact.html
similarity index 100%
rename from danube/page/contact/contact.html
rename to danube/page/default_contact/contact.html
diff --git a/danube/page/contact/contact.tpl b/danube/page/default_contact/contact.tpl
similarity index 100%
rename from danube/page/contact/contact.tpl
rename to danube/page/default_contact/contact.tpl
diff --git a/danube/page/default_contact/default_contact.php b/danube/page/default_contact/default_contact.php
new file mode 100644
index 0000000..2a42cd9
--- /dev/null
+++ b/danube/page/default_contact/default_contact.php
@@ -0,0 +1,12 @@
+<?php
+
+class default_contact extends SYSTEM\PAGE\Page {
+    public function html(){
+        $vars = array();                        
+        $vars['content'] = '';
+        
+        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        
+        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_contact/contact.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/danube/page/default_page/danube.tpl b/danube/page/default_page/danube.tpl
index 512bf4e..2a2cf8d 100644
--- a/danube/page/default_page/danube.tpl
+++ b/danube/page/default_page/danube.tpl
@@ -2,9 +2,8 @@
 <html>
     <head>
         <title>${danube_page_title}</title>
-
-        <!-- Bootstrap -->
-        <link href="bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+        
+        ${css}
         ${js}
     </head>
     <!--<body style="background: #3366CC;"> -->
diff --git a/danube/page/default_page/default_page.php b/danube/page/default_page/default_page.php
index 8d29c94..f58f83e 100644
--- a/danube/page/default_page/default_page.php
+++ b/danube/page/default_page/default_page.php
@@ -4,18 +4,22 @@ class default_page extends SYSTEM\PAGE\Page {
     
     private function js(){        
         return  '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PJQUERY(),'jquery-1.9.1.min.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.
-                '<script type="text/javascript" language="JavaScript" src="http://mojotrollz.eu/web/danube/danube/page/js/loadtexts.js"></script>'.
-                '<script type="text/javascript" src="http://www.openlayers.org/api/OpenLayers.js"></script>
-                 <script type="text/javascript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>
-                 <script type="text/javascript" src="http://mojotrollz.eu/web/danube/danube/page/osm/osm.js"></script>';
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'js/bootstrap.min.js').'"></script>'.                
+                '<script type="text/javascript" language="JavaScript" src="http://www.openlayers.org/api/OpenLayers.js"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="http://www.openstreetmap.org/openlayers/OpenStreetMap.js"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'default_page/js/loadtexts.js').'"></script>'.
+                '<script type="text/javascript" language="JavaScript" src="'.SYSTEM\WEBPATH(new PPAGE(),'osm/osm.js').'"></script>';
     }
     
+    private function css(){
+        return '<link href="'.SYSTEM\WEBPATH(new PBOOTSTRAP(),'css/bootstrap.min.css').'" rel="stylesheet" media="screen">';}
+    
     public function html(){
         $vars = array();  
+        $vars['css'] = $this->css();
         $vars['js'] = $this->js();        
                 
-        $vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));       
+        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));       
         
         return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_page/danube.tpl'), $vars);
         
diff --git a/danube/page/js/dasense-ui.js b/danube/page/default_page/js/dasense-ui.js
similarity index 100%
rename from danube/page/js/dasense-ui.js
rename to danube/page/default_page/js/dasense-ui.js
diff --git a/danube/page/js/dasense.tpl b/danube/page/default_page/js/dasense.tpl
similarity index 100%
rename from danube/page/js/dasense.tpl
rename to danube/page/default_page/js/dasense.tpl
diff --git a/danube/page/js/loadtexts.js b/danube/page/default_page/js/loadtexts.js
similarity index 100%
rename from danube/page/js/loadtexts.js
rename to danube/page/default_page/js/loadtexts.js
diff --git a/danube/page/default_prices/default_prices.php b/danube/page/default_prices/default_prices.php
new file mode 100644
index 0000000..2720ad6
--- /dev/null
+++ b/danube/page/default_prices/default_prices.php
@@ -0,0 +1,11 @@
+<?php
+
+class default_prices extends SYSTEM\PAGE\Page {
+    public function html(){
+        $vars = array();                 
+        
+        $vars = array_merge($vars, \SYSTEM\locale::getStrings(\DBD\locale_string::VALUE_CATEGORY_DASENSE));
+        
+        return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_prices/prices.tpl'), $vars);
+    }
+}
\ No newline at end of file
diff --git a/danube/page/prices/prices.html b/danube/page/default_prices/prices.html
similarity index 100%
rename from danube/page/prices/prices.html
rename to danube/page/default_prices/prices.html
diff --git a/danube/page/prices/prices.tpl b/danube/page/default_prices/prices.tpl
similarity index 100%
rename from danube/page/prices/prices.tpl
rename to danube/page/default_prices/prices.tpl
diff --git a/danube/page/prices/prices.php b/danube/page/prices/prices.php
deleted file mode 100644
index 849bf0e..0000000
--- a/danube/page/prices/prices.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-class prices extends SYSTEM\PAGE\Page {
-    public function html(){
-        $vars = array();                 
-        
-        $vars = array_merge($vars, SYSTEM\locale::getStrings(\SYSTEM\DBD\locale_string::VALUE_CATEGORY_DASENSE));
-        
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'prices/prices.tpl'), $vars);
-    }
-}
\ No newline at end of file
diff --git a/danube/page/register_page_classes.php b/danube/page/register_page_classes.php
index b3cf493..457f688 100644
--- a/danube/page/register_page_classes.php
+++ b/danube/page/register_page_classes.php
@@ -5,6 +5,6 @@ $autoload = SYSTEM\autoload::getInstance();
 $autoload->registerFolder(dirname(__FILE__),'');
 $autoload->registerFolder(dirname(__FILE__).'/default_page','');
 $autoload->registerFolder(dirname(__FILE__).'/googlemaps','');
-$autoload->registerFolder(dirname(__FILE__).'/prices','');
+$autoload->registerFolder(dirname(__FILE__).'/default_prices','');
 $autoload->registerFolder(dirname(__FILE__).'/osm','');
-$autoload->registerFolder(dirname(__FILE__).'/contact','');
\ No newline at end of file
+$autoload->registerFolder(dirname(__FILE__).'/default_contact','');
\ No newline at end of file
diff --git a/danube/path/PBOOTSTRAP.php b/danube/path/PBOOTSTRAP.php
index 4629d67..6ce768f 100644
--- a/danube/path/PBOOTSTRAP.php
+++ b/danube/path/PBOOTSTRAP.php
@@ -1,5 +1,5 @@
 <?php
 class PBOOTSTRAP extends \SYSTEM\PATH {
     public static function getPath(){
-        return \SYSTEM\C_ROOT.'bootstrap/'.\SYSTEM\C_SUBPATH;}
+        return \SYSTEM\C_ROOT.'lib/bootstrap/'.\SYSTEM\C_SUBPATH;}
 }
diff --git a/danube/path/PJQUERY.php b/danube/path/PJQUERY.php
index c80c7a3..26c0dca 100644
--- a/danube/path/PJQUERY.php
+++ b/danube/path/PJQUERY.php
@@ -1,5 +1,5 @@
 <?php
 class PJQUERY extends \SYSTEM\PATH {
     public static function getPath(){
-        return \SYSTEM\C_ROOT.'jquery/'.\SYSTEM\C_SUBPATH;}
+        return \SYSTEM\C_ROOT.'lib/jquery/'.\SYSTEM\C_SUBPATH;}
 }
diff --git a/bootstrap/bootstrap.zip b/lib/bootstrap/bootstrap.zip
similarity index 100%
rename from bootstrap/bootstrap.zip
rename to lib/bootstrap/bootstrap.zip
diff --git a/bootstrap/css/bootstrap-responsive.css b/lib/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from bootstrap/css/bootstrap-responsive.css
rename to lib/bootstrap/css/bootstrap-responsive.css
diff --git a/bootstrap/css/bootstrap-responsive.min.css b/lib/bootstrap/css/bootstrap-responsive.min.css
similarity index 100%
rename from bootstrap/css/bootstrap-responsive.min.css
rename to lib/bootstrap/css/bootstrap-responsive.min.css
diff --git a/bootstrap/css/bootstrap.css b/lib/bootstrap/css/bootstrap.css
similarity index 100%
rename from bootstrap/css/bootstrap.css
rename to lib/bootstrap/css/bootstrap.css
diff --git a/bootstrap/css/bootstrap.min.css b/lib/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from bootstrap/css/bootstrap.min.css
rename to lib/bootstrap/css/bootstrap.min.css
diff --git a/bootstrap/img/glyphicons-halflings-white.png b/lib/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from bootstrap/img/glyphicons-halflings-white.png
rename to lib/bootstrap/img/glyphicons-halflings-white.png
diff --git a/bootstrap/img/glyphicons-halflings.png b/lib/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from bootstrap/img/glyphicons-halflings.png
rename to lib/bootstrap/img/glyphicons-halflings.png
diff --git a/bootstrap/js/bootstrap.js b/lib/bootstrap/js/bootstrap.js
similarity index 100%
rename from bootstrap/js/bootstrap.js
rename to lib/bootstrap/js/bootstrap.js
diff --git a/bootstrap/js/bootstrap.min.js b/lib/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from bootstrap/js/bootstrap.min.js
rename to lib/bootstrap/js/bootstrap.min.js
diff --git a/jquery/jquery-1.9.1.min.js b/lib/jquery/jquery-1.9.1.min.js
similarity index 100%
rename from jquery/jquery-1.9.1.min.js
rename to lib/jquery/jquery-1.9.1.min.js