diff --git a/source/lib/MediaListing/Main.class.php b/source/lib/MediaListing/Main.class.php
index 2e00358..a511b31 100644
--- a/source/lib/MediaListing/Main.class.php
+++ b/source/lib/MediaListing/Main.class.php
@@ -6,8 +6,8 @@ class MediaListing_Main extends SihnonFramework_Main {
 
     protected static $instance;
     
-    protected $template_dir = '../source/templates'; 
-    protected $template_code_dir = '../source/pages';
+    protected $template_dir = '../source/webui/templates'; 
+    protected $template_code_dir = '../source/webui/pages';
 
     protected $smarty;
     protected $request;
diff --git a/source/pages/errors/404.php b/source/webui/pages/errors/404.php
similarity index 100%
rename from source/pages/errors/404.php
rename to source/webui/pages/errors/404.php
diff --git a/source/pages/errors/unhandled-exception.php b/source/webui/pages/errors/unhandled-exception.php
similarity index 100%
rename from source/pages/errors/unhandled-exception.php
rename to source/webui/pages/errors/unhandled-exception.php
diff --git a/source/pages/home.php b/source/webui/pages/home.php
similarity index 100%
rename from source/pages/home.php
rename to source/webui/pages/home.php
diff --git a/source/pages/list.php b/source/webui/pages/list.php
similarity index 100%
rename from source/pages/list.php
rename to source/webui/pages/list.php
diff --git a/source/templates/errors/404.tpl b/source/webui/templates/errors/404.tpl
similarity index 100%
rename from source/templates/errors/404.tpl
rename to source/webui/templates/errors/404.tpl
diff --git a/source/templates/errors/unhandled-exception.tpl b/source/webui/templates/errors/unhandled-exception.tpl
similarity index 100%
rename from source/templates/errors/unhandled-exception.tpl
rename to source/webui/templates/errors/unhandled-exception.tpl
diff --git a/source/templates/home.tpl b/source/webui/templates/home.tpl
similarity index 100%
rename from source/templates/home.tpl
rename to source/webui/templates/home.tpl
diff --git a/source/templates/index.tpl b/source/webui/templates/index.tpl
similarity index 100%
rename from source/templates/index.tpl
rename to source/webui/templates/index.tpl
diff --git a/source/templates/list.tpl b/source/webui/templates/list.tpl
similarity index 100%
rename from source/templates/list.tpl
rename to source/webui/templates/list.tpl
diff --git a/source/templates/sidebar.tpl b/source/webui/templates/sidebar.tpl
similarity index 100%
rename from source/templates/sidebar.tpl
rename to source/webui/templates/sidebar.tpl