diff --git a/htmlUI/templates/header.tpl b/htmlUI/templates/header.tpl
index e8c2dc67e..9a67b59af 100644
--- a/htmlUI/templates/header.tpl
+++ b/htmlUI/templates/header.tpl
@@ -6,22 +6,22 @@
     <title>Campcaster</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
-    <link href="htmlUI/html/styles_campcaster.css" rel="stylesheet" type="text/css" />
-    <link href="htmlUI/html/assets/plupload/plupload.queue.css" rel="stylesheet" type="text/css" />
-    <link href="htmlUI/html/css/playlist.css" rel="stylesheet" type="text/css" />
+    <link href="html/styles_campcaster.css" rel="stylesheet" type="text/css" />
+    <link href="html/assets/plupload/plupload.queue.css" rel="stylesheet" type="text/css" />
+    <link href="html/css/playlist.css" rel="stylesheet" type="text/css" />
 
-	<script type="text/javascript" src="htmlUI/html/assets/jquery-1.4.2.min.js"></script>
-	<script type="text/javascript" src="htmlUI/html/assets/jquery-ui-1.8.5.custom.min.js"></script>
+	<script type="text/javascript" src="html/assets/jquery-1.4.2.min.js"></script>
+	<script type="text/javascript" src="html/assets/jquery-ui-1.8.5.custom.min.js"></script>
 
-	<script type="text/javascript" src="htmlUI/html/assets/plupload/plupload.full.min.js"></script>
-	<script type="text/javascript" src="htmlUI/html/assets/plupload/jquery.plupload.queue.min.js"></script>
+	<script type="text/javascript" src="html/assets/plupload/plupload.full.min.js"></script>
+	<script type="text/javascript" src="html/assets/plupload/jquery.plupload.queue.min.js"></script>
 
     {include file="script/basics.js.tpl"}
     {include file="script/contextmenu.js.tpl"}
     {include file="script/collector.js.tpl"}
     {include file="script/alttext.js.tpl"}
-    
-    <script type="text/javascript" src="htmlUI/html/js/playlist.js"></script>
+
+    <script type="text/javascript" src="html/js/playlist.js"></script>
 
 </head>
 
diff --git a/htmlUI/templates/popup/header.tpl b/htmlUI/templates/popup/header.tpl
index 50b85cdc1..bdaf794df 100644
--- a/htmlUI/templates/popup/header.tpl
+++ b/htmlUI/templates/popup/header.tpl
@@ -5,7 +5,7 @@
 <head>
     <title>Campcaster</title>
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-    <link href="htmlUI/html/styles_popup.css" rel="stylesheet" type="text/css" />
+    <link href="html/styles_popup.css" rel="stylesheet" type="text/css" />
 
     <script type="text/javascript">
     {UIBROWSER->getAlertMsg assign='alertMsg'}
diff --git a/htmlUI/ui_conf.php b/htmlUI/ui_conf.php
index 58d27209d..8ffd88ceb 100644
--- a/htmlUI/ui_conf.php
+++ b/htmlUI/ui_conf.php
@@ -24,8 +24,8 @@ define('UI_UPLOAD_LANGID', UI_DEFAULT_LANGID);
 define('UI_TIMEZONEOFFSET', date('Z'));
 
 // Basic scripts
-define('UI_HANDLER', 'htmlUI/ui_handler.php');
-define('UI_BROWSER', 'htmlUI/ui_browser.php');
+define('UI_HANDLER', 'ui_handler.php');
+define('UI_BROWSER', 'ui_browser.php');
 
 // HTML Form stuff
 define('UI_STANDARD_FORM_METHOD', 'POST');
diff --git a/htmlUI/ui_handler.php b/htmlUI/ui_handler.php
index c761d833b..498fae377 100644
--- a/htmlUI/ui_handler.php
+++ b/htmlUI/ui_handler.php
@@ -19,9 +19,9 @@ switch ($_REQUEST['act']) {
 	        # $uiHandler->PLAYLIST->reportLookedPL();
 	        $uiHandler->PLAYLIST->loadLookedFromPref();
 	    }
-	    include(dirname(__FILE__).'/htmlUI/templates/loader/index.tpl');
-	    include(dirname(__FILE__).'/htmlUI/templates/popup/_reload_parent.tpl');
-	    include(dirname(__FILE__).'/htmlUI/templates/popup/_close.tpl');
+	    include(dirname(__FILE__).'/templates/loader/index.tpl');
+	    include(dirname(__FILE__).'/templates/popup/_reload_parent.tpl');
+	    include(dirname(__FILE__).'/templates/popup/_close.tpl');
 	    exit;
 
     case "logout":
diff --git a/index.php b/index.php
index 6134f8c55..6fee6e162 100644
--- a/index.php
+++ b/index.php
@@ -1,12 +1,12 @@
 <?php
 
-require_once(dirname(__FILE__)."/htmlUI/ui_browser.php");
-//if (strpos($_SERVER['PHP_SELF'], '~') !== false) {
-//    list(, $user, ) = explode('/', $_SERVER['PHP_SELF']);
-//    $base = "/$user/campcaster";
-//} else {
-//    $base = "/campcaster";
-//}
-//
-//header("LOCATION: $base/ui_browser.php");
+//require_once(dirname(__FILE__)."/htmlUI/ui_browser.php");
+if (strpos($_SERVER['PHP_SELF'], '~') !== false) {
+    list(, $user, ) = explode('/', $_SERVER['PHP_SELF']);
+    $base = "/$user/campcaster";
+} else {
+    $base = "/campcaster";
+}
+
+header("LOCATION: $base/htmlUI/ui_browser.php");
 ?>
\ No newline at end of file
