diff --git a/common.php b/common.php
index 6425d377..54d34751 100644
--- a/common.php
+++ b/common.php
@@ -92,6 +92,7 @@ if(!empty($CONF['language_hook']) && function_exists($CONF['language_hook'])) {
 
 Config::write('__LANG', $PALANG);
 
+unset($incpath);
 
 if (!defined('POSTFIXADMIN_CLI')) {
     if(!is_file("$incpath/smarty.inc.php")) {
@@ -99,5 +100,6 @@ if (!defined('POSTFIXADMIN_CLI')) {
     }
     require_once ("$incpath/smarty.inc.php");
 }
+
 /* vim: set expandtab softtabstop=4 tabstop=4 shiftwidth=4: */
 ?>
diff --git a/broadcast-message.php b/public/broadcast-message.php
similarity index 100%
rename from broadcast-message.php
rename to public/broadcast-message.php
diff --git a/calendar.js b/public/calendar.js
similarity index 100%
rename from calendar.js
rename to public/calendar.js
diff --git a/public/common.php b/public/common.php
new file mode 100644
index 00000000..3e4da4bb
--- /dev/null
+++ b/public/common.php
@@ -0,0 +1,3 @@
+<?php
+require_once(dirname(__FILE__) . '/../common.php');
+
diff --git a/css/calendar.css b/public/css/calendar.css
similarity index 100%
rename from css/calendar.css
rename to public/css/calendar.css
diff --git a/css/default.css b/public/css/default.css
similarity index 100%
rename from css/default.css
rename to public/css/default.css
diff --git a/delete.php b/public/delete.php
similarity index 91%
rename from delete.php
rename to public/delete.php
index 6d09677b..426c1b77 100644
--- a/delete.php
+++ b/public/delete.php
@@ -28,7 +28,7 @@ $table = safeget('table');
 
 $handlerclass = ucfirst($table) . 'Handler';
 
-if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists(dirname(__FILE__) . "/../model/$handlerclass.php")) { # validate $table
     die ("Invalid table name given!");
 }
 
diff --git a/edit.php b/public/edit.php
similarity index 98%
rename from edit.php
rename to public/edit.php
index b8c9544c..9b34a297 100644
--- a/edit.php
+++ b/public/edit.php
@@ -29,7 +29,7 @@ $username = authentication_get_username(); # enforce login
 $table = safepost('table', safeget('table'));
 $handlerclass = ucfirst($table) . 'Handler';
 
-if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists(dirname(__FILE__) . "/../model/$handlerclass.php")) { # validate $table
     die ("Invalid table name given!");
 }
 
diff --git a/editactive.php b/public/editactive.php
similarity index 91%
rename from editactive.php
rename to public/editactive.php
index a5d706d0..178afe9b 100644
--- a/editactive.php
+++ b/public/editactive.php
@@ -29,7 +29,7 @@ $active = safeget('active');
 
 $handlerclass = ucfirst($table) . 'Handler';
 
-if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists(dirname(__FILE__) . "/../model/$handlerclass.php")) { # validate $table
     die ("Invalid table name given!");
 }
 
diff --git a/images/arrow-l.png b/public/images/arrow-l.png
similarity index 100%
rename from images/arrow-l.png
rename to public/images/arrow-l.png
diff --git a/images/arrow-r.png b/public/images/arrow-r.png
similarity index 100%
rename from images/arrow-r.png
rename to public/images/arrow-r.png
diff --git a/images/arrow-u.png b/public/images/arrow-u.png
similarity index 100%
rename from images/arrow-u.png
rename to public/images/arrow-u.png
diff --git a/images/calendar/cal.gif b/public/images/calendar/cal.gif
similarity index 100%
rename from images/calendar/cal.gif
rename to public/images/calendar/cal.gif
diff --git a/images/calendar/next_mon.gif b/public/images/calendar/next_mon.gif
similarity index 100%
rename from images/calendar/next_mon.gif
rename to public/images/calendar/next_mon.gif
diff --git a/images/calendar/next_year.gif b/public/images/calendar/next_year.gif
similarity index 100%
rename from images/calendar/next_year.gif
rename to public/images/calendar/next_year.gif
diff --git a/images/calendar/no_cal.gif b/public/images/calendar/no_cal.gif
similarity index 100%
rename from images/calendar/no_cal.gif
rename to public/images/calendar/no_cal.gif
diff --git a/images/calendar/pixel.gif b/public/images/calendar/pixel.gif
similarity index 100%
rename from images/calendar/pixel.gif
rename to public/images/calendar/pixel.gif
diff --git a/images/calendar/prev_mon.gif b/public/images/calendar/prev_mon.gif
similarity index 100%
rename from images/calendar/prev_mon.gif
rename to public/images/calendar/prev_mon.gif
diff --git a/images/calendar/prev_year.gif b/public/images/calendar/prev_year.gif
similarity index 100%
rename from images/calendar/prev_year.gif
rename to public/images/calendar/prev_year.gif
diff --git a/images/calendar/shade_bl.png b/public/images/calendar/shade_bl.png
similarity index 100%
rename from images/calendar/shade_bl.png
rename to public/images/calendar/shade_bl.png
diff --git a/images/calendar/shade_bm.png b/public/images/calendar/shade_bm.png
similarity index 100%
rename from images/calendar/shade_bm.png
rename to public/images/calendar/shade_bm.png
diff --git a/images/calendar/shade_br.png b/public/images/calendar/shade_br.png
similarity index 100%
rename from images/calendar/shade_br.png
rename to public/images/calendar/shade_br.png
diff --git a/images/calendar/shade_mr.png b/public/images/calendar/shade_mr.png
similarity index 100%
rename from images/calendar/shade_mr.png
rename to public/images/calendar/shade_mr.png
diff --git a/images/calendar/shade_tr.png b/public/images/calendar/shade_tr.png
similarity index 100%
rename from images/calendar/shade_tr.png
rename to public/images/calendar/shade_tr.png
diff --git a/images/favicon.ico b/public/images/favicon.ico
similarity index 100%
rename from images/favicon.ico
rename to public/images/favicon.ico
diff --git a/images/index.php b/public/images/index.php
similarity index 100%
rename from images/index.php
rename to public/images/index.php
diff --git a/images/logo-default.png b/public/images/logo-default.png
similarity index 100%
rename from images/logo-default.png
rename to public/images/logo-default.png
diff --git a/images/mail_bg.gif b/public/images/mail_bg.gif
similarity index 100%
rename from images/mail_bg.gif
rename to public/images/mail_bg.gif
diff --git a/images/postbox.png b/public/images/postbox.png
similarity index 100%
rename from images/postbox.png
rename to public/images/postbox.png
diff --git a/images/postfixadmin.png b/public/images/postfixadmin.png
similarity index 100%
rename from images/postfixadmin.png
rename to public/images/postfixadmin.png
diff --git a/images/postfixadmin2.png b/public/images/postfixadmin2.png
similarity index 100%
rename from images/postfixadmin2.png
rename to public/images/postfixadmin2.png
diff --git a/images/postfixadmin2.xcf b/public/images/postfixadmin2.xcf
similarity index 100%
rename from images/postfixadmin2.xcf
rename to public/images/postfixadmin2.xcf
diff --git a/images/quota-colors.png b/public/images/quota-colors.png
similarity index 100%
rename from images/quota-colors.png
rename to public/images/quota-colors.png
diff --git a/index.php b/public/index.php
similarity index 83%
rename from index.php
rename to public/index.php
index e5f5e796..e7d0a8fe 100644
--- a/index.php
+++ b/public/index.php
@@ -22,8 +22,8 @@
 
 $CONF = array('configured' => FALSE);
 
-if(file_exists(dirname(__FILE__) . '/config.inc.php')) {
-    require_once('config.inc.php');
+if(file_exists(dirname(__FILE__) . '/../config.inc.php')) {
+    require_once(dirname(__FILE__) . '/../config.inc.php');
 }
 
 if ( $CONF['configured'] === TRUE )
@@ -67,9 +67,9 @@ if ( $CONF['configured'] === TRUE )
         <h2>What now?</h2>
 
         <ol>
-            <li>Read the <a href='INSTALL.TXT'>INSTALL.txt</a> file</li>
+            <li>Read the <a href='https://raw.githubusercontent.com/postfixadmin/postfixadmin/master/INSTALL.TXT'>INSTALL.TXT</a> file</li>
             <li>Configure Postfix to use your chosen database - see (for example) the following pages :
-            <ul>
+            <ul><!-- TODO: get newer URLs ... -->
                 <li><a href="http://codepoets.co.uk/postfixadmin-postgresql-courier-squirrelmail-debian-etch-howto-tutorial">Postfix/PostgreSQL/Postfixadmin/Courier</a></li>
                 <li><a href="http://bliki.rimuhosting.com/space/knowledgebase/linux/mail/postfixadmin+on+debian+sarge">Postfix/MySQL/Postfixadmin/Dovecot</a></li>
                 <li><a href="http://gentoo-wiki.com/HOWTO_Setup_a_Virtual_Postfix/Courier_Mail_System_with_PostfixAdmin">Postfix/MySQL/Postfixamdin/Courier</a></li>
@@ -80,10 +80,14 @@ if ( $CONF['configured'] === TRUE )
         <p><b>When you have configured Postfixadmin, this page will be replaced with a login page.</b></p>
         <p>You can now run <a href="setup.php">setup</a> to make sure that all the PHP functions are available for Postfix Admin to run.<br />
         <p> If you still encounter any problems, please check the documentation and website for more information.</p>
+
         <h2>Postfix Admin Web sites</h2>
         <p>For further help, or documentation please check out -
-        <a href="http://postfixadmin.org">Postfix Admin</a> web site<br />
-        <a href="http://sourceforge.net/forum/forum.php?forum_id=676076">Knowledge Base</a>
+        <ul>
+            <li><a href="http://github.com/postfixadmin/postfixadmin">GitHub - Postfix Admin</a> web site</li>
+            <li><a href="http://postfixadmin.org">Postfix Admin</a> web site<br /></li>
+            <li><a href="http://sourceforge.net/forum/forum.php?forum_id=676076">Knowledge Base</a></li>
+        </ul>
         </p>
         </p>
     </body>
diff --git a/list-virtual.php b/public/list-virtual.php
similarity index 100%
rename from list-virtual.php
rename to public/list-virtual.php
diff --git a/list.php b/public/list.php
similarity index 96%
rename from list.php
rename to public/list.php
index 09b26bc8..9fe64a3b 100644
--- a/list.php
+++ b/public/list.php
@@ -25,7 +25,7 @@ $table = safeget('table');
 
 $handlerclass = ucfirst($table) . 'Handler';
 
-if ( !preg_match('/^[a-z]+$/', $table) || !file_exists("model/$handlerclass.php")) { # validate $table
+if ( !preg_match('/^[a-z]+$/', $table) || !file_exists(dirname(__FILE__) . "/../model/$handlerclass.php")) { # validate $table
      die ("Invalid table name given!");
 }
 
diff --git a/login.php b/public/login.php
similarity index 100%
rename from login.php
rename to public/login.php
diff --git a/main.php b/public/main.php
similarity index 100%
rename from main.php
rename to public/main.php
diff --git a/password-change.php b/public/password-change.php
similarity index 100%
rename from password-change.php
rename to public/password-change.php
diff --git a/password-recover.php b/public/password-recover.php
similarity index 100%
rename from password-recover.php
rename to public/password-recover.php
diff --git a/sendmail.php b/public/sendmail.php
similarity index 100%
rename from sendmail.php
rename to public/sendmail.php
diff --git a/setup.php b/public/setup.php
similarity index 98%
rename from setup.php
rename to public/setup.php
index 1bb7841d..65e82c9f 100644
--- a/setup.php
+++ b/public/setup.php
@@ -29,7 +29,7 @@ require_once(dirname(__FILE__).'/common.php'); # make sure correct common.php is
 $CONF['show_header_text'] = 'NO';
 $CONF['theme_logo'] = 'images/logo-default.png';
 $CONF['theme_css'] = 'css/default.css';
-require($incpath.'/templates/header.php');
+require(dirname(__FILE__) . '/../templates/header.php');
 ?>
 
 <div class='setup'>
@@ -53,8 +53,8 @@ $f_preg_match = function_exists ("preg_match");
 $f_mb_encode_mimeheader = function_exists ("mb_encode_mimeheader");
 $f_imap_open = function_exists ("imap_open");
 
-$file_config = file_exists (realpath ("./config.inc.php"));
-$file_local_config = file_exists (realpath ("./config.local.php"));
+$file_config = file_exists (realpath ("./../config.inc.php"));
+$file_local_config = file_exists (realpath ("./../config.local.php"));
 
 $error = 0;
 
@@ -130,7 +130,7 @@ $config_loaded = 0;
 if ($file_config == 1)
 {
     print "<li>Depends on: presence config.inc.php - OK</li>\n";
-    require_once($incpath.'/config.inc.php');
+    require_once(dirname(__FILE__) .'/../config.inc.php');
     $config_loaded = 1;
 
     if(isset($CONF['configured'])) {
@@ -327,7 +327,7 @@ if ($error != 0)
 else
 {
     print "<p>Everything seems fine... attempting to create/update database structure</p>\n";
-    require_once($incpath.'/upgrade.php');
+    require_once(dirname(__FILE__) .'/upgrade.php');
 
     $tUsername = '';
     $setupMessage = '';
diff --git a/upgrade.php b/public/upgrade.php
similarity index 100%
rename from upgrade.php
rename to public/upgrade.php
diff --git a/users/calendar.js b/public/users/calendar.js
similarity index 100%
rename from users/calendar.js
rename to public/users/calendar.js
diff --git a/users/css/calendar.css b/public/users/css/calendar.css
similarity index 100%
rename from users/css/calendar.css
rename to public/users/css/calendar.css
diff --git a/users/css/default.css b/public/users/css/default.css
similarity index 100%
rename from users/css/default.css
rename to public/users/css/default.css
diff --git a/users/edit-alias.php b/public/users/edit-alias.php
similarity index 100%
rename from users/edit-alias.php
rename to public/users/edit-alias.php
diff --git a/users/images/calendar/cal.gif b/public/users/images/calendar/cal.gif
similarity index 100%
rename from users/images/calendar/cal.gif
rename to public/users/images/calendar/cal.gif
diff --git a/users/images/calendar/next_mon.gif b/public/users/images/calendar/next_mon.gif
similarity index 100%
rename from users/images/calendar/next_mon.gif
rename to public/users/images/calendar/next_mon.gif
diff --git a/users/images/calendar/next_year.gif b/public/users/images/calendar/next_year.gif
similarity index 100%
rename from users/images/calendar/next_year.gif
rename to public/users/images/calendar/next_year.gif
diff --git a/users/images/calendar/no_cal.gif b/public/users/images/calendar/no_cal.gif
similarity index 100%
rename from users/images/calendar/no_cal.gif
rename to public/users/images/calendar/no_cal.gif
diff --git a/users/images/calendar/pixel.gif b/public/users/images/calendar/pixel.gif
similarity index 100%
rename from users/images/calendar/pixel.gif
rename to public/users/images/calendar/pixel.gif
diff --git a/users/images/calendar/prev_mon.gif b/public/users/images/calendar/prev_mon.gif
similarity index 100%
rename from users/images/calendar/prev_mon.gif
rename to public/users/images/calendar/prev_mon.gif
diff --git a/users/images/calendar/prev_year.gif b/public/users/images/calendar/prev_year.gif
similarity index 100%
rename from users/images/calendar/prev_year.gif
rename to public/users/images/calendar/prev_year.gif
diff --git a/users/images/calendar/shade_bl.png b/public/users/images/calendar/shade_bl.png
similarity index 100%
rename from users/images/calendar/shade_bl.png
rename to public/users/images/calendar/shade_bl.png
diff --git a/users/images/calendar/shade_bm.png b/public/users/images/calendar/shade_bm.png
similarity index 100%
rename from users/images/calendar/shade_bm.png
rename to public/users/images/calendar/shade_bm.png
diff --git a/users/images/calendar/shade_br.png b/public/users/images/calendar/shade_br.png
similarity index 100%
rename from users/images/calendar/shade_br.png
rename to public/users/images/calendar/shade_br.png
diff --git a/users/images/calendar/shade_mr.png b/public/users/images/calendar/shade_mr.png
similarity index 100%
rename from users/images/calendar/shade_mr.png
rename to public/users/images/calendar/shade_mr.png
diff --git a/users/images/calendar/shade_tr.png b/public/users/images/calendar/shade_tr.png
similarity index 100%
rename from users/images/calendar/shade_tr.png
rename to public/users/images/calendar/shade_tr.png
diff --git a/users/index.php b/public/users/index.php
similarity index 100%
rename from users/index.php
rename to public/users/index.php
diff --git a/users/login.php b/public/users/login.php
similarity index 100%
rename from users/login.php
rename to public/users/login.php
diff --git a/users/main.php b/public/users/main.php
similarity index 100%
rename from users/main.php
rename to public/users/main.php
diff --git a/users/password-change.php b/public/users/password-change.php
similarity index 100%
rename from users/password-change.php
rename to public/users/password-change.php
diff --git a/users/password-recover.php b/public/users/password-recover.php
similarity index 100%
rename from users/password-recover.php
rename to public/users/password-recover.php
diff --git a/users/password.php b/public/users/password.php
similarity index 100%
rename from users/password.php
rename to public/users/password.php
diff --git a/users/vacation.php b/public/users/vacation.php
similarity index 100%
rename from users/vacation.php
rename to public/users/vacation.php
diff --git a/vacation.php b/public/vacation.php
similarity index 100%
rename from vacation.php
rename to public/vacation.php
diff --git a/viewlog.php b/public/viewlog.php
similarity index 100%
rename from viewlog.php
rename to public/viewlog.php
diff --git a/xmlrpc.php b/public/xmlrpc.php
similarity index 100%
rename from xmlrpc.php
rename to public/xmlrpc.php
diff --git a/smarty.inc.php b/smarty.inc.php
index e416533f..dee834f1 100644
--- a/smarty.inc.php
+++ b/smarty.inc.php
@@ -12,7 +12,6 @@ class PFASmarty {
         $this->template = new Smarty();
 
         //$this->template->debugging = true;
-        $incpath = dirname(__FILE__);
         $this->template->setTemplateDir(dirname(__FILE__) . '/templates');
 
         // if it's not present or writeable, smarty should just not cache.