diff --git a/danube/api/autoload.inc.php b/danube/api/autoload.inc
similarity index 100%
rename from danube/api/autoload.inc.php
rename to danube/api/autoload.inc
diff --git a/danube/autoload.inc b/danube/autoload.inc
index 12d9887..2ea6ca5 100644
--- a/danube/autoload.inc
+++ b/danube/autoload.inc
@@ -1,8 +1,8 @@
 <?php
 require_once dirname(__FILE__).'/path/autoload.inc';
-require_once dirname(__FILE__).'/page/register_page_classes.php';
-require_once dirname(__FILE__).'/sql/autoload.inc.php';
-require_once dirname(__FILE__).'/api/autoload.inc.php';
-require_once dirname(__FILE__).'/files/autoload.inc.php';
-require_once dirname(__FILE__).'/config/autoload.inc.php';
+require_once dirname(__FILE__).'/page/autoload.inc';
+require_once dirname(__FILE__).'/sql/autoload.inc';
+require_once dirname(__FILE__).'/api/autoload.inc';
+require_once dirname(__FILE__).'/files/autoload.inc';
+require_once dirname(__FILE__).'/config/autoload.inc';
 require_once dirname(__FILE__).'/sai/autoload.inc';
\ No newline at end of file
diff --git a/danube/config/autoload.inc.php b/danube/config/autoload.inc
similarity index 100%
rename from danube/config/autoload.inc.php
rename to danube/config/autoload.inc
diff --git a/danube/files/autoload.inc.php b/danube/files/autoload.inc
similarity index 100%
rename from danube/files/autoload.inc.php
rename to danube/files/autoload.inc
diff --git a/danube/page/register_page_classes.php b/danube/page/autoload.inc
similarity index 100%
rename from danube/page/register_page_classes.php
rename to danube/page/autoload.inc
diff --git a/danube/page/default_certificates/certificates.html b/danube/page/default_certificates/certificates.html
deleted file mode 100644
index 7ebaf78..0000000
--- a/danube/page/default_certificates/certificates.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-${danube_page_partners}
-</div> 
\ No newline at end of file
diff --git a/danube/page/default_certificates/default_certificates.php b/danube/page/default_certificates/default_certificates.php
index 2bc67b9..e8017ec 100644
--- a/danube/page/default_certificates/default_certificates.php
+++ b/danube/page/default_certificates/default_certificates.php
@@ -2,19 +2,15 @@
 class default_certificates extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
-        
         $vars['gallery_certifictes'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
-        
-        return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_certificates/cerfiticates.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_certificates/tpl/cerfiticates.tpl'))->SERVERPATH(), $vars);
     }
-    
     private function gallery(){
         $pics = \SYSTEM\FILES\files::get('certificates');
         $result = '';
         foreach($pics as $pic){
-            $result .= '<img src="api.php?call=files&cat=certificates&id='.$pic.'" alt="" />';
-        }
+            $result .= '<img src="api.php?call=files&cat=certificates&id='.$pic.'" alt="" />';}
         return $result;
     }
 }
\ No newline at end of file
diff --git a/danube/page/default_certificates/cerfiticates.tpl b/danube/page/default_certificates/tpl/cerfiticates.tpl
similarity index 100%
rename from danube/page/default_certificates/cerfiticates.tpl
rename to danube/page/default_certificates/tpl/cerfiticates.tpl
diff --git a/danube/page/default_contact/contact.html b/danube/page/default_contact/contact.html
deleted file mode 100644
index 0bfe7ff..0000000
--- a/danube/page/default_contact/contact.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>${danube_page_contact}</div>
\ No newline at end of file
diff --git a/danube/page/default_contact/default_contact.php b/danube/page/default_contact/default_contact.php
index 1cf3997..6f45941 100644
--- a/danube/page/default_contact/default_contact.php
+++ b/danube/page/default_contact/default_contact.php
@@ -4,9 +4,7 @@ class default_contact extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                        
         $vars['content'] = '';
-        
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
-        
-        return SYSTEM\PAGE\replace::replaceFile(SYSTEM\SERVERPATH(new PPAGE(),'default_contact/contact.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_contact/tpl/contact.tpl'))->SERVERPATH(), $vars);
     }
 }
\ No newline at end of file
diff --git a/danube/page/default_contact/contact.tpl b/danube/page/default_contact/tpl/contact.tpl
similarity index 100%
rename from danube/page/default_contact/contact.tpl
rename to danube/page/default_contact/tpl/contact.tpl
diff --git a/danube/page/default_impressions/default_impressions.php b/danube/page/default_impressions/default_impressions.php
index 7757839..224c531 100644
--- a/danube/page/default_impressions/default_impressions.php
+++ b/danube/page/default_impressions/default_impressions.php
@@ -1,21 +1,17 @@
 <?php
-
 class default_impressions extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
-                
         $vars['gallery_impressions'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
-        
-        return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_impressions/impressions.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_impressions/tpl/impressions.tpl'))->SERVERPATH(), $vars);
     }
     
     private function gallery(){
         $pics = \SYSTEM\FILES\files::get('impressions');
         $result = '';
         foreach($pics as $pic){
-            $result .= '<img src="api.php?call=files&cat=impressions&id='.$pic.'" alt="" />';
-        }
+            $result .= '<img src="api.php?call=files&cat=impressions&id='.$pic.'" alt="" />';}
         return $result;
     }
 }
\ No newline at end of file
diff --git a/danube/page/default_impressions/impressions.html b/danube/page/default_impressions/impressions.html
deleted file mode 100644
index 7ebaf78..0000000
--- a/danube/page/default_impressions/impressions.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-${danube_page_partners}
-</div> 
\ No newline at end of file
diff --git a/danube/page/default_impressions/impressions.tpl b/danube/page/default_impressions/tpl/impressions.tpl
similarity index 100%
rename from danube/page/default_impressions/impressions.tpl
rename to danube/page/default_impressions/tpl/impressions.tpl
diff --git a/danube/page/default_page/tpl/danube.tpl b/danube/page/default_page/tpl/danube.tpl
index c54947d..9a6fa76 100644
--- a/danube/page/default_page/tpl/danube.tpl
+++ b/danube/page/default_page/tpl/danube.tpl
@@ -18,56 +18,55 @@
         <div style="width: 900px; margin-right: auto; margin-left: auto;"><img src="danube/page/default_page/pics/css/font.png" /></div>
         <div class="hero-unit" style=" border: 1px solid black; border-top: 0px solid black; box-shadow: 5px 5px 3px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); width: 934px; padding: 0px; margin: 0; margin-bottom: 15px; padding-bottom: -10px; margin-left: auto; margin-right: auto; margin-top: -2px;">
             <div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin: 0; padding: 0; border-top-left-radius: 5px; border-top-right-radius: 5px; -moz-border-bottom-left-radius: 0; -moz-border-bottom-right-radius: 0; border-bottom-left-radius: 5px; border-bottom-right-radius: 5px;">
-                <div id="danube_menu" class="navbar navbar-inverse" style="height: 32px;">
-                    <div class="navbar-inner" style="border-bottom-left-radius: 0px; border-bottom-right-radius: 0px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); ">                
-                        <div class="1container">
-                            <button type="button" class="btn btn-navbar" data-toggle="collapse" data-target=".nav-collapse">
-                                <span class="icon-bar"></span>
-                                <span class="icon-bar"></span>
-                                <span class="icon-bar"></span>
-                            </button>
-                            <a class="brand" href="" url="?action=default_page">${danube_menu_home}</a>
-                            <div class="nav-collapse collapse">
-                                <ul class="nav">
-                                    <li><a href="javascript:switchTextBg('white')" url="./?page=introduction">${danube_menu_introduction}</a></li>
-                                    <li><a href="javascript:switchTextBg('white')" url="./?page=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
-                                    <li><a href="javascript:switchTextBg('white')" url="./?page=contact">${danube_menu_contact}</a></li>
-                                    <li><a href="javascript:switchTextBg('black')" url="./?page=impressions" textbg="black">${danube_menu_impressions}</a></li>
-                                    <li><a href="javascript:switchTextBg('black')" url="./?page=partners">${danube_menu_partners}</a></li>
-                                    <li><a href="javascript:switchTextBg('black')" url="./?page=certificates">${danube_menu_certificates}</a></li>
-                                </ul>       
-                            </div>
+                <nav id="danube_menu" class="navbar navbar-inverse">
+                    <div class="container-fluid">
+                        <!-- Brand and toggle get grouped for better mobile display -->
+                        <div class="navbar-header">
+                          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+                            <span class="sr-only">Toggle navigation</span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                            <span class="icon-bar"></span>
+                          </button>
+                          <a class="navbar-brand" href="" url="?action=default_page">${danube_menu_home}</a>
                         </div>
-                        <div id="fb" style="margin-left: 750px; padding-top: 15px;">
-                            <iframe src="https://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.blue-danube-massage.de&amp;layout=button_count&amp;show_faces=true&amp;width=450&amp;action=like&amp;colorscheme=light&amp;height=80" scrolling="no" frameborder="0" style="border:none; overflow:hidden; height:80px; margin: 0; padding: 0; width: 140px;" allowTransparency="true"></iframe>
-                        </div>
-                    </div>               
-                </div>
-                            
-                <div id="myCarousel" class="carousel slide" style="background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto;  border-bottom: 0px solid black;">
-                    <div class="carousel-inner">
-                        <div id="pic">
-                            ${danube_page_headpic_home} 
+                        <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                            <ul class="nav navbar-nav">
+                                <li><a href="javascript:switchTextBg('white')" url="./?page=introduction">${danube_menu_introduction}</a></li>
+                                <li><a href="javascript:switchTextBg('white')" url="./?page=prices" url_pic="danube/page/default_page/pics/photos/bar_front2.png">${danube_menu_prices}</a></li>
+                                <li><a href="javascript:switchTextBg('white')" url="./?page=contact">${danube_menu_contact}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?page=impressions" textbg="black">${danube_menu_impressions}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?page=partners">${danube_menu_partners}</a></li>
+                                <li><a href="javascript:switchTextBg('black')" url="./?page=certificates">${danube_menu_certificates}</a></li>
+                            </ul>
                         </div>
                     </div>
+                </nav>
+            </div>
+                            
+            <div id="myCarousel" class="carousel slide" style="background: black; width: 916px; padding: 0; margin: 0; margin-left: auto; margin-right: auto;  border-bottom: 0px solid black;">
+                <div class="carousel-inner">
+                    <div id="pic">
+                        ${danube_page_headpic_home} 
+                    </div>
                 </div>
+            </div>
         
-                <div id="space" style="height: 7px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin-left: 9px; margin-right: 9px;"></div>
+            <div id="space" style="height: 7px; background: url(danube/page/default_page/pics/css/verlauf_bg.png); margin-left: 9px; margin-right: 9px;"></div>
 
-                <div class="hero-unit" id="text" style="line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black;  border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;">
-                    ${languageFlags}
-                    <div id="site-content-wrapper" style="width: 100%; background: none;">
+            <div class="hero-unit" id="text" style="line-height: 180%; fonz-size: 80%; border-top-left-radius: 5; border-top-right-radius: 5; border-right: 1px solid black;  border-left: 1px solid black; padding: 0; padding-left: 20px; padding-bottom: 20px; padding-top: 15px; margin: 0; margin-bottom: 3px; margin-left: 8px; margin-right: 8px; background: white;">
+                ${languageFlags}
+                <div id="site-content-wrapper" style="width: 100%; background: none;">
 
-                        <div id="site-content" style="width: 100%; background: none;">
-                            ${danube_page_content}
-                            <div style="clear: both;"></div>
-                        </div>
-                    </div>   
+                    <div id="site-content" style="width: 100%; background: none;">
+                        ${danube_page_content}
+                        <div style="clear: both;"></div>
+                    </div>
+                </div>   
 
-                </div>    
-                <div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png)no-repeat; text-align: right; font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;">
-                    ${danube_footer}
-                </div>
+            </div>    
+            <div class="hero-unit" style="background: url(danube/page/default_page/pics/css/verlauf_bg.png)no-repeat; text-align: right; font-size: 75%; color: grey; height: 25px; padding: 0; margin: 0; border-top-left-radius: 0; border-top-right-radius: 0; padding-bottom: 3px; padding-right: 3px;">
+                ${danube_footer}
             </div>
         </div>
     </body>
diff --git a/danube/page/default_partners/default_partners.php b/danube/page/default_partners/default_partners.php
index 16a9f31..64dcd3d 100644
--- a/danube/page/default_partners/default_partners.php
+++ b/danube/page/default_partners/default_partners.php
@@ -1,22 +1,16 @@
 <?php
-
 class default_partners extends SYSTEM\PAGE\Page {
     public function html(){
         $vars = array();                 
-        
         $vars['gallery_partners'] = $this->gallery();
         $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
-        
-        return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_partners/partners.tpl'), $vars);
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_partners/tpl/partners.tpl'))->SERVERPATH(), $vars);
     }
-    
     private function gallery(){
         $pics = \SYSTEM\FILES\files::get('partners');
         $result = '';
         foreach($pics as $pic){
-            $result .= '<img src="api.php?call=files&cat=partners&id='.$pic.'" alt="" />';
-        }
+            $result .= '<img src="api.php?call=files&cat=partners&id='.$pic.'" alt="" />';}
         return $result;
     }
-
 }
\ No newline at end of file
diff --git a/danube/page/default_partners/partners.html b/danube/page/default_partners/partners.html
deleted file mode 100644
index 7ebaf78..0000000
--- a/danube/page/default_partners/partners.html
+++ /dev/null
@@ -1,3 +0,0 @@
-<div>
-${danube_page_partners}
-</div> 
\ No newline at end of file
diff --git a/danube/page/default_partners/partners.tpl b/danube/page/default_partners/tpl/partners.tpl
similarity index 100%
rename from danube/page/default_partners/partners.tpl
rename to danube/page/default_partners/tpl/partners.tpl
diff --git a/danube/page/default_prices/default_prices.php b/danube/page/default_prices/default_prices.php
index 1d79f18..d8ec4fb 100644
--- a/danube/page/default_prices/default_prices.php
+++ b/danube/page/default_prices/default_prices.php
@@ -1,11 +1,7 @@
 <?php
-
 class default_prices extends SYSTEM\PAGE\Page {
     public function html(){
-        $vars = array();                 
-        
-        $vars = array_merge($vars, \SYSTEM\PAGE\text::tag('danube'));
-        
-        return SYSTEM\PAGE\replace::replaceFile(\SYSTEM\SERVERPATH(new PPAGE(),'default_prices/prices.tpl'), $vars);
+        $vars = \SYSTEM\PAGE\text::tag('danube');
+        return SYSTEM\PAGE\replace::replaceFile((new PPAGE('default_prices/tpl/prices.tpl'))->SERVERPATH(), $vars);
     }
 }
\ No newline at end of file
diff --git a/danube/page/default_prices/prices.html b/danube/page/default_prices/prices.html
deleted file mode 100644
index f44260e..0000000
--- a/danube/page/default_prices/prices.html
+++ /dev/null
@@ -1 +0,0 @@
-<div>${content};</div>
\ No newline at end of file
diff --git a/danube/page/default_prices/prices.tpl b/danube/page/default_prices/tpl/prices.tpl
similarity index 100%
rename from danube/page/default_prices/prices.tpl
rename to danube/page/default_prices/tpl/prices.tpl
diff --git a/danube/sql/autoload.inc.php b/danube/sql/autoload.inc
similarity index 100%
rename from danube/sql/autoload.inc.php
rename to danube/sql/autoload.inc