diff --git a/upload/.htaccess b/.htaccess
similarity index 100%
rename from upload/.htaccess
rename to .htaccess
diff --git a/README.md b/README.md
index 03597f610..c8157c951 100644
--- a/README.md
+++ b/README.md
@@ -7,7 +7,7 @@ TorrentPier II - движок торрент-трекера, написанны
 
 Для установки вам необходимо выполнить несколько простых шагов:
 
-1. Распаковываем на сервер содержимое папки **upload**
+1. Распаковываем на сервер содержимое скачанной вами папки
 
 2. Создаем базу данных, в которую при помощи phpmyadmin (или любого другого удобного инструмента) импортируем дамп, расположенный в папке **install/sql/mysql.sql**
 3. Правим файл конфигурации **library/config.php**, загруженный на сервер:
diff --git a/upload/admin/admin_attach_cp.php b/admin/admin_attach_cp.php
similarity index 100%
rename from upload/admin/admin_attach_cp.php
rename to admin/admin_attach_cp.php
diff --git a/upload/admin/admin_attachments.php b/admin/admin_attachments.php
similarity index 100%
rename from upload/admin/admin_attachments.php
rename to admin/admin_attachments.php
diff --git a/upload/admin/admin_board.php b/admin/admin_board.php
similarity index 100%
rename from upload/admin/admin_board.php
rename to admin/admin_board.php
diff --git a/upload/admin/admin_bt_forum_cfg.php b/admin/admin_bt_forum_cfg.php
similarity index 100%
rename from upload/admin/admin_bt_forum_cfg.php
rename to admin/admin_bt_forum_cfg.php
diff --git a/upload/admin/admin_bt_tracker_cfg.php b/admin/admin_bt_tracker_cfg.php
similarity index 100%
rename from upload/admin/admin_bt_tracker_cfg.php
rename to admin/admin_bt_tracker_cfg.php
diff --git a/upload/admin/admin_cron.php b/admin/admin_cron.php
similarity index 100%
rename from upload/admin/admin_cron.php
rename to admin/admin_cron.php
diff --git a/upload/admin/admin_disallow.php b/admin/admin_disallow.php
similarity index 100%
rename from upload/admin/admin_disallow.php
rename to admin/admin_disallow.php
diff --git a/upload/admin/admin_extensions.php b/admin/admin_extensions.php
similarity index 100%
rename from upload/admin/admin_extensions.php
rename to admin/admin_extensions.php
diff --git a/upload/admin/admin_forum_prune.php b/admin/admin_forum_prune.php
similarity index 100%
rename from upload/admin/admin_forum_prune.php
rename to admin/admin_forum_prune.php
diff --git a/upload/admin/admin_forumauth.php b/admin/admin_forumauth.php
similarity index 100%
rename from upload/admin/admin_forumauth.php
rename to admin/admin_forumauth.php
diff --git a/upload/admin/admin_forumauth_list.php b/admin/admin_forumauth_list.php
similarity index 100%
rename from upload/admin/admin_forumauth_list.php
rename to admin/admin_forumauth_list.php
diff --git a/upload/admin/admin_forums.php b/admin/admin_forums.php
similarity index 100%
rename from upload/admin/admin_forums.php
rename to admin/admin_forums.php
diff --git a/upload/admin/admin_groups.php b/admin/admin_groups.php
similarity index 100%
rename from upload/admin/admin_groups.php
rename to admin/admin_groups.php
diff --git a/upload/admin/admin_log.php b/admin/admin_log.php
similarity index 100%
rename from upload/admin/admin_log.php
rename to admin/admin_log.php
diff --git a/upload/admin/admin_mass_email.php b/admin/admin_mass_email.php
similarity index 100%
rename from upload/admin/admin_mass_email.php
rename to admin/admin_mass_email.php
diff --git a/upload/admin/admin_phpinfo.php b/admin/admin_phpinfo.php
similarity index 100%
rename from upload/admin/admin_phpinfo.php
rename to admin/admin_phpinfo.php
diff --git a/upload/admin/admin_ranks.php b/admin/admin_ranks.php
similarity index 100%
rename from upload/admin/admin_ranks.php
rename to admin/admin_ranks.php
diff --git a/upload/admin/admin_rebuild_search.php b/admin/admin_rebuild_search.php
similarity index 100%
rename from upload/admin/admin_rebuild_search.php
rename to admin/admin_rebuild_search.php
diff --git a/upload/admin/admin_sitemap.php b/admin/admin_sitemap.php
similarity index 100%
rename from upload/admin/admin_sitemap.php
rename to admin/admin_sitemap.php
diff --git a/upload/admin/admin_smilies.php b/admin/admin_smilies.php
similarity index 100%
rename from upload/admin/admin_smilies.php
rename to admin/admin_smilies.php
diff --git a/upload/admin/admin_terms.php b/admin/admin_terms.php
similarity index 100%
rename from upload/admin/admin_terms.php
rename to admin/admin_terms.php
diff --git a/upload/admin/admin_ug_auth.php b/admin/admin_ug_auth.php
similarity index 100%
rename from upload/admin/admin_ug_auth.php
rename to admin/admin_ug_auth.php
diff --git a/upload/admin/admin_user_ban.php b/admin/admin_user_ban.php
similarity index 100%
rename from upload/admin/admin_user_ban.php
rename to admin/admin_user_ban.php
diff --git a/upload/admin/admin_user_search.php b/admin/admin_user_search.php
similarity index 100%
rename from upload/admin/admin_user_search.php
rename to admin/admin_user_search.php
diff --git a/upload/admin/admin_words.php b/admin/admin_words.php
similarity index 100%
rename from upload/admin/admin_words.php
rename to admin/admin_words.php
diff --git a/upload/admin/index.php b/admin/index.php
similarity index 100%
rename from upload/admin/index.php
rename to admin/index.php
diff --git a/upload/admin/pagestart.php b/admin/pagestart.php
similarity index 100%
rename from upload/admin/pagestart.php
rename to admin/pagestart.php
diff --git a/upload/admin/stats/tr_stats.php b/admin/stats/tr_stats.php
similarity index 100%
rename from upload/admin/stats/tr_stats.php
rename to admin/stats/tr_stats.php
diff --git a/upload/admin/stats/tracker.php b/admin/stats/tracker.php
similarity index 100%
rename from upload/admin/stats/tracker.php
rename to admin/stats/tracker.php
diff --git a/upload/ajax.php b/ajax.php
similarity index 100%
rename from upload/ajax.php
rename to ajax.php
diff --git a/upload/bt/announce.php b/bt/announce.php
similarity index 99%
rename from upload/bt/announce.php
rename to bt/announce.php
index 15bc122a4..70fc72331 100644
--- a/upload/bt/announce.php
+++ b/bt/announce.php
@@ -187,7 +187,7 @@ function msg_die ($msg)
 
 // Start announcer
 define('TR_ROOT', './');
-require(TR_ROOT .'includes/init_tr.php');
+require(TR_ROOT . 'includes/init_tr.php');
 
 $seeder  = ($left == 0) ? 1 : 0;
 $stopped = ($event === 'stopped');
diff --git a/upload/bt/includes/.htaccess b/bt/includes/.htaccess
similarity index 100%
rename from upload/bt/includes/.htaccess
rename to bt/includes/.htaccess
diff --git a/upload/bt/includes/init_tr.php b/bt/includes/init_tr.php
similarity index 100%
rename from upload/bt/includes/init_tr.php
rename to bt/includes/init_tr.php
diff --git a/upload/bt/index.php b/bt/index.php
similarity index 100%
rename from upload/bt/index.php
rename to bt/index.php
diff --git a/upload/bt/robots.txt b/bt/robots.txt
similarity index 100%
rename from upload/bt/robots.txt
rename to bt/robots.txt
diff --git a/upload/bt/scrape.php b/bt/scrape.php
similarity index 96%
rename from upload/bt/scrape.php
rename to bt/scrape.php
index 1821161ef..e09ebbb9b 100644
--- a/upload/bt/scrape.php
+++ b/bt/scrape.php
@@ -33,7 +33,7 @@ function msg_die ($msg)
 }
 
 define('TR_ROOT', './');
-require(TR_ROOT .'includes/init_tr.php');
+require(TR_ROOT . 'includes/init_tr.php');
 
 $info_hash_sql = rtrim(DB()->escape($info_hash), ' ');
 
diff --git a/upload/callseed.php b/callseed.php
similarity index 100%
rename from upload/callseed.php
rename to callseed.php
diff --git a/upload/common.php b/common.php
similarity index 99%
rename from upload/common.php
rename to common.php
index 68ae49dc5..1a2e40ec6 100644
--- a/upload/common.php
+++ b/common.php
@@ -17,7 +17,7 @@ if (!defined('IN_FORUM') && !defined('IN_TRACKER')) define('IN_FORUM', true);
 header('X-Frame-Options: SAMEORIGIN');
 
 // Get initial config
-require(BB_ROOT .'library/config.php');
+require(BB_ROOT . 'library/config.php');
 
 $server_protocol = ($bb_cfg['cookie_secure']) ? 'https://' : 'http://';
 $server_port = ($bb_cfg['server_port'] != 80) ? ':'. $bb_cfg['server_port'] : '';
diff --git a/upload/cron.php b/cron.php
similarity index 100%
rename from upload/cron.php
rename to cron.php
diff --git a/upload/crossdomain.xml b/crossdomain.xml
similarity index 100%
rename from upload/crossdomain.xml
rename to crossdomain.xml
diff --git a/upload/data/avatars/gallery/bot.gif b/data/avatars/gallery/bot.gif
similarity index 100%
rename from upload/data/avatars/gallery/bot.gif
rename to data/avatars/gallery/bot.gif
diff --git a/upload/data/avatars/gallery/noavatar.png b/data/avatars/gallery/noavatar.png
similarity index 100%
rename from upload/data/avatars/gallery/noavatar.png
rename to data/avatars/gallery/noavatar.png
diff --git a/upload/data/old_files/.htaccess b/data/old_files/.htaccess
similarity index 100%
rename from upload/data/old_files/.htaccess
rename to data/old_files/.htaccess
diff --git a/upload/data/torrent_files/.htaccess b/data/torrent_files/.htaccess
similarity index 100%
rename from upload/data/torrent_files/.htaccess
rename to data/torrent_files/.htaccess
diff --git a/upload/dl.php b/dl.php
similarity index 100%
rename from upload/dl.php
rename to dl.php
diff --git a/upload/dl_list.php b/dl_list.php
similarity index 100%
rename from upload/dl_list.php
rename to dl_list.php
diff --git a/upload/favicon.ico b/favicon.ico
similarity index 100%
rename from upload/favicon.ico
rename to favicon.ico
diff --git a/upload/feed.php b/feed.php
similarity index 100%
rename from upload/feed.php
rename to feed.php
diff --git a/upload/group.php b/group.php
similarity index 100%
rename from upload/group.php
rename to group.php
diff --git a/upload/group_edit.php b/group_edit.php
similarity index 100%
rename from upload/group_edit.php
rename to group_edit.php
diff --git a/upload/index.php b/index.php
similarity index 100%
rename from upload/index.php
rename to index.php
diff --git a/upload/info.php b/info.php
similarity index 95%
rename from upload/info.php
rename to info.php
index 5a596c053..500596c8d 100644
--- a/upload/info.php
+++ b/info.php
@@ -46,7 +46,7 @@ $require = file_exists($html_dir . $info['src']) ? $html_dir . $info['src'] : $h
 <head>
 	<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
 	<meta http-equiv="Content-Style-Type" content="text/css" />
-	<link rel="stylesheet" href="./styles/templates/default/css/main.css" type="text/css">
+	<link rel="stylesheet" href="styles/templates/default/css/main.css" type="text/css">
 </head>
 <body>
 <style type="text/css">
diff --git a/other/converter/TBDevYSE_pre6/ReadMe.txt b/install/other/converter/TBDevYSE_pre6/ReadMe.txt
similarity index 100%
rename from other/converter/TBDevYSE_pre6/ReadMe.txt
rename to install/other/converter/TBDevYSE_pre6/ReadMe.txt
diff --git a/other/converter/TBDevYSE_pre6/for_tbdev/announce.php b/install/other/converter/TBDevYSE_pre6/for_tbdev/announce.php
similarity index 98%
rename from other/converter/TBDevYSE_pre6/for_tbdev/announce.php
rename to install/other/converter/TBDevYSE_pre6/for_tbdev/announce.php
index ab3632160..f419ab6d9 100644
--- a/other/converter/TBDevYSE_pre6/for_tbdev/announce.php
+++ b/install/other/converter/TBDevYSE_pre6/for_tbdev/announce.php
@@ -59,4 +59,4 @@ unset($res, $user, $dbpasswd, $passkey, $user_id);
 
 // Execute TP's announce
 chdir(TP_ROOT .'bt/');
-require ('announce.php');
+require('announce.php');
diff --git a/other/converter/TBDevYSE_pre6/for_tbdev/pass.php b/install/other/converter/TBDevYSE_pre6/for_tbdev/pass.php
similarity index 100%
rename from other/converter/TBDevYSE_pre6/for_tbdev/pass.php
rename to install/other/converter/TBDevYSE_pre6/for_tbdev/pass.php
diff --git a/other/converter/TBDevYSE_pre6/root/convert.php b/install/other/converter/TBDevYSE_pre6/root/convert.php
similarity index 97%
rename from other/converter/TBDevYSE_pre6/root/convert.php
rename to install/other/converter/TBDevYSE_pre6/root/convert.php
index c4eb51b24..48192b3a2 100644
--- a/other/converter/TBDevYSE_pre6/root/convert.php
+++ b/install/other/converter/TBDevYSE_pre6/root/convert.php
@@ -3,9 +3,9 @@
 define ('IN_FORUM', true);
 define ('BB_ROOT', './');
 require (BB_ROOT .'common.php');
-require (BB_ROOT .'converter/constants.php');
-require (BB_ROOT .'converter/settings.php');
-require (BB_ROOT .'converter/functions.php');
+require(BB_ROOT . 'converter/constants.php');
+require(BB_ROOT . 'converter/settings.php');
+require(BB_ROOT . 'converter/functions.php');
 
 // Start session management
 $user->session_start();
diff --git a/other/converter/TBDevYSE_pre6/root/converter/constants.php b/install/other/converter/TBDevYSE_pre6/root/converter/constants.php
similarity index 100%
rename from other/converter/TBDevYSE_pre6/root/converter/constants.php
rename to install/other/converter/TBDevYSE_pre6/root/converter/constants.php
diff --git a/other/converter/TBDevYSE_pre6/root/converter/functions.php b/install/other/converter/TBDevYSE_pre6/root/converter/functions.php
similarity index 100%
rename from other/converter/TBDevYSE_pre6/root/converter/functions.php
rename to install/other/converter/TBDevYSE_pre6/root/converter/functions.php
diff --git a/other/converter/TBDevYSE_pre6/root/converter/passwords.php b/install/other/converter/TBDevYSE_pre6/root/converter/passwords.php
similarity index 100%
rename from other/converter/TBDevYSE_pre6/root/converter/passwords.php
rename to install/other/converter/TBDevYSE_pre6/root/converter/passwords.php
diff --git a/other/converter/TBDevYSE_pre6/root/converter/settings.php b/install/other/converter/TBDevYSE_pre6/root/converter/settings.php
similarity index 100%
rename from other/converter/TBDevYSE_pre6/root/converter/settings.php
rename to install/other/converter/TBDevYSE_pre6/root/converter/settings.php
diff --git a/other/converter/TBDevYSE_pre6/root/recover.php b/install/other/converter/TBDevYSE_pre6/root/recover.php
similarity index 95%
rename from other/converter/TBDevYSE_pre6/root/recover.php
rename to install/other/converter/TBDevYSE_pre6/root/recover.php
index 6bfd66540..2411f9820 100644
--- a/other/converter/TBDevYSE_pre6/root/recover.php
+++ b/install/other/converter/TBDevYSE_pre6/root/recover.php
@@ -4,8 +4,8 @@ define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
 require(INC_DIR .'functions_torrent.php');
-require(BB_ROOT .'converter/settings.php');
-require(BB_ROOT .'converter/functions.php');
+require(BB_ROOT . 'converter/settings.php');
+require(BB_ROOT . 'converter/functions.php');
 
 // Init userdata
 $user->session_start();
diff --git a/other/recover/converter/constants.php b/install/other/recover/converter/constants.php
similarity index 100%
rename from other/recover/converter/constants.php
rename to install/other/recover/converter/constants.php
diff --git a/other/recover/converter/functions.php b/install/other/recover/converter/functions.php
similarity index 100%
rename from other/recover/converter/functions.php
rename to install/other/recover/converter/functions.php
diff --git a/other/recover/converter/passwords.php b/install/other/recover/converter/passwords.php
similarity index 100%
rename from other/recover/converter/passwords.php
rename to install/other/recover/converter/passwords.php
diff --git a/other/recover/converter/settings.php b/install/other/recover/converter/settings.php
similarity index 100%
rename from other/recover/converter/settings.php
rename to install/other/recover/converter/settings.php
diff --git a/other/recover/recover.php b/install/other/recover/recover.php
similarity index 95%
rename from other/recover/recover.php
rename to install/other/recover/recover.php
index 89bf4c40c..5c6f70fd1 100644
--- a/other/recover/recover.php
+++ b/install/other/recover/recover.php
@@ -4,8 +4,8 @@ define('IN_FORUM', true);
 define('BB_ROOT', './');
 require(BB_ROOT .'common.php');
 require(INC_DIR .'functions_torrent.php');
-require(BB_ROOT .'converter/settings.php');
-require(BB_ROOT .'converter/functions.php');
+require(BB_ROOT . 'converter/settings.php');
+require(BB_ROOT . 'converter/functions.php');
 
 // Init userdata
 $user->session_start();
diff --git a/install/php-fpm+nginx/nginx.conf b/install/php-fpm+nginx/nginx.conf
index b96c28a6e..0dc5e1803 100644
--- a/install/php-fpm+nginx/nginx.conf
+++ b/install/php-fpm+nginx/nginx.conf
@@ -128,7 +128,7 @@ http {
            #allow YOUR_IP;
         }
         # Deny folder (Sec. lvl1)
-        location ~ \/(internal_data|library)\/ {
+        location ~ \/(install|internal_data|library)\/ {
             deny all;
         }
 
diff --git a/upgrade/changes.txt b/install/upgrade/changes.txt
similarity index 100%
rename from upgrade/changes.txt
rename to install/upgrade/changes.txt
diff --git a/upgrade/r496-user_birthday.php b/install/upgrade/r496-user_birthday.php
similarity index 100%
rename from upgrade/r496-user_birthday.php
rename to install/upgrade/r496-user_birthday.php
diff --git a/upgrade/r571-dl_upgrade.php b/install/upgrade/r571-dl_upgrade.php
similarity index 100%
rename from upgrade/r571-dl_upgrade.php
rename to install/upgrade/r571-dl_upgrade.php
diff --git a/upgrade/r575-poll_upgrade.php b/install/upgrade/r575-poll_upgrade.php
similarity index 100%
rename from upgrade/r575-poll_upgrade.php
rename to install/upgrade/r575-poll_upgrade.php
diff --git a/upgrade/r583-convert_avatars.php b/install/upgrade/r583-convert_avatars.php
similarity index 100%
rename from upgrade/r583-convert_avatars.php
rename to install/upgrade/r583-convert_avatars.php
diff --git a/upgrade/r588-short_lang.php b/install/upgrade/r588-short_lang.php
similarity index 100%
rename from upgrade/r588-short_lang.php
rename to install/upgrade/r588-short_lang.php
diff --git a/upgrade/r600-stable.php b/install/upgrade/r600-stable.php
similarity index 100%
rename from upgrade/r600-stable.php
rename to install/upgrade/r600-stable.php
diff --git a/upload/internal_data/ajax_html/jumpbox_guest.html b/internal_data/ajax_html/jumpbox_guest.html
similarity index 100%
rename from upload/internal_data/ajax_html/jumpbox_guest.html
rename to internal_data/ajax_html/jumpbox_guest.html
diff --git a/upload/internal_data/ajax_html/jumpbox_user.html b/internal_data/ajax_html/jumpbox_user.html
similarity index 100%
rename from upload/internal_data/ajax_html/jumpbox_user.html
rename to internal_data/ajax_html/jumpbox_user.html
diff --git a/upload/internal_data/atom/.keep b/internal_data/atom/.keep
similarity index 100%
rename from upload/internal_data/atom/.keep
rename to internal_data/atom/.keep
diff --git a/upload/internal_data/cache/.htaccess b/internal_data/cache/.htaccess
similarity index 100%
rename from upload/internal_data/cache/.htaccess
rename to internal_data/cache/.htaccess
diff --git a/upload/internal_data/captcha/.keep b/internal_data/captcha/.keep
similarity index 100%
rename from upload/internal_data/captcha/.keep
rename to internal_data/captcha/.keep
diff --git a/upload/internal_data/log/.htaccess b/internal_data/log/.htaccess
similarity index 100%
rename from upload/internal_data/log/.htaccess
rename to internal_data/log/.htaccess
diff --git a/upload/internal_data/log/cron/.htaccess b/internal_data/log/cron/.htaccess
similarity index 100%
rename from upload/internal_data/log/cron/.htaccess
rename to internal_data/log/cron/.htaccess
diff --git a/upload/internal_data/sitemap/.keep b/internal_data/sitemap/.keep
similarity index 100%
rename from upload/internal_data/sitemap/.keep
rename to internal_data/sitemap/.keep
diff --git a/upload/internal_data/triggers/$on b/internal_data/triggers/$on
similarity index 100%
rename from upload/internal_data/triggers/$on
rename to internal_data/triggers/$on
diff --git a/upload/internal_data/triggers/.htaccess b/internal_data/triggers/.htaccess
similarity index 100%
rename from upload/internal_data/triggers/.htaccess
rename to internal_data/triggers/.htaccess
diff --git a/upload/internal_data/triggers/cron_allowed b/internal_data/triggers/cron_allowed
similarity index 100%
rename from upload/internal_data/triggers/cron_allowed
rename to internal_data/triggers/cron_allowed
diff --git a/upload/library/ajax/avatar.php b/library/ajax/avatar.php
similarity index 100%
rename from upload/library/ajax/avatar.php
rename to library/ajax/avatar.php
diff --git a/upload/library/ajax/change_tor_status.php b/library/ajax/change_tor_status.php
similarity index 100%
rename from upload/library/ajax/change_tor_status.php
rename to library/ajax/change_tor_status.php
diff --git a/upload/library/ajax/change_torrent.php b/library/ajax/change_torrent.php
similarity index 100%
rename from upload/library/ajax/change_torrent.php
rename to library/ajax/change_torrent.php
diff --git a/upload/library/ajax/change_user_opt.php b/library/ajax/change_user_opt.php
similarity index 100%
rename from upload/library/ajax/change_user_opt.php
rename to library/ajax/change_user_opt.php
diff --git a/upload/library/ajax/change_user_rank.php b/library/ajax/change_user_rank.php
similarity index 100%
rename from upload/library/ajax/change_user_rank.php
rename to library/ajax/change_user_rank.php
diff --git a/upload/library/ajax/edit_group_profile.php b/library/ajax/edit_group_profile.php
similarity index 100%
rename from upload/library/ajax/edit_group_profile.php
rename to library/ajax/edit_group_profile.php
diff --git a/upload/library/ajax/edit_user_profile.php b/library/ajax/edit_user_profile.php
similarity index 100%
rename from upload/library/ajax/edit_user_profile.php
rename to library/ajax/edit_user_profile.php
diff --git a/upload/library/ajax/gen_passkey.php b/library/ajax/gen_passkey.php
similarity index 100%
rename from upload/library/ajax/gen_passkey.php
rename to library/ajax/gen_passkey.php
diff --git a/upload/library/ajax/group_membership.php b/library/ajax/group_membership.php
similarity index 100%
rename from upload/library/ajax/group_membership.php
rename to library/ajax/group_membership.php
diff --git a/upload/library/ajax/index_data.php b/library/ajax/index_data.php
similarity index 100%
rename from upload/library/ajax/index_data.php
rename to library/ajax/index_data.php
diff --git a/upload/library/ajax/manage_admin.php b/library/ajax/manage_admin.php
similarity index 100%
rename from upload/library/ajax/manage_admin.php
rename to library/ajax/manage_admin.php
diff --git a/upload/library/ajax/manage_user.php b/library/ajax/manage_user.php
similarity index 100%
rename from upload/library/ajax/manage_user.php
rename to library/ajax/manage_user.php
diff --git a/upload/library/ajax/mod_action.php b/library/ajax/mod_action.php
similarity index 100%
rename from upload/library/ajax/mod_action.php
rename to library/ajax/mod_action.php
diff --git a/upload/library/ajax/post_mod_comment.php b/library/ajax/post_mod_comment.php
similarity index 100%
rename from upload/library/ajax/post_mod_comment.php
rename to library/ajax/post_mod_comment.php
diff --git a/upload/library/ajax/posts.php b/library/ajax/posts.php
similarity index 100%
rename from upload/library/ajax/posts.php
rename to library/ajax/posts.php
diff --git a/upload/library/ajax/sitemap.php b/library/ajax/sitemap.php
similarity index 100%
rename from upload/library/ajax/sitemap.php
rename to library/ajax/sitemap.php
diff --git a/upload/library/ajax/topic_tpl.php b/library/ajax/topic_tpl.php
similarity index 100%
rename from upload/library/ajax/topic_tpl.php
rename to library/ajax/topic_tpl.php
diff --git a/upload/library/ajax/user_register.php b/library/ajax/user_register.php
similarity index 100%
rename from upload/library/ajax/user_register.php
rename to library/ajax/user_register.php
diff --git a/upload/library/ajax/view_post.php b/library/ajax/view_post.php
similarity index 100%
rename from upload/library/ajax/view_post.php
rename to library/ajax/view_post.php
diff --git a/upload/library/ajax/view_torrent.php b/library/ajax/view_torrent.php
similarity index 100%
rename from upload/library/ajax/view_torrent.php
rename to library/ajax/view_torrent.php
diff --git a/upload/library/attach_mod/.htaccess b/library/attach_mod/.htaccess
similarity index 100%
rename from upload/library/attach_mod/.htaccess
rename to library/attach_mod/.htaccess
diff --git a/upload/library/attach_mod/attachment_mod.php b/library/attach_mod/attachment_mod.php
similarity index 100%
rename from upload/library/attach_mod/attachment_mod.php
rename to library/attach_mod/attachment_mod.php
diff --git a/upload/library/attach_mod/displaying.php b/library/attach_mod/displaying.php
similarity index 100%
rename from upload/library/attach_mod/displaying.php
rename to library/attach_mod/displaying.php
diff --git a/upload/library/attach_mod/displaying_torrent.php b/library/attach_mod/displaying_torrent.php
similarity index 100%
rename from upload/library/attach_mod/displaying_torrent.php
rename to library/attach_mod/displaying_torrent.php
diff --git a/upload/library/attach_mod/includes/.htaccess b/library/attach_mod/includes/.htaccess
similarity index 100%
rename from upload/library/attach_mod/includes/.htaccess
rename to library/attach_mod/includes/.htaccess
diff --git a/upload/library/attach_mod/includes/functions_admin.php b/library/attach_mod/includes/functions_admin.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_admin.php
rename to library/attach_mod/includes/functions_admin.php
diff --git a/upload/library/attach_mod/includes/functions_attach.php b/library/attach_mod/includes/functions_attach.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_attach.php
rename to library/attach_mod/includes/functions_attach.php
diff --git a/upload/library/attach_mod/includes/functions_delete.php b/library/attach_mod/includes/functions_delete.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_delete.php
rename to library/attach_mod/includes/functions_delete.php
diff --git a/upload/library/attach_mod/includes/functions_filetypes.php b/library/attach_mod/includes/functions_filetypes.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_filetypes.php
rename to library/attach_mod/includes/functions_filetypes.php
diff --git a/upload/library/attach_mod/includes/functions_includes.php b/library/attach_mod/includes/functions_includes.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_includes.php
rename to library/attach_mod/includes/functions_includes.php
diff --git a/upload/library/attach_mod/includes/functions_selects.php b/library/attach_mod/includes/functions_selects.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_selects.php
rename to library/attach_mod/includes/functions_selects.php
diff --git a/upload/library/attach_mod/includes/functions_thumbs.php b/library/attach_mod/includes/functions_thumbs.php
similarity index 100%
rename from upload/library/attach_mod/includes/functions_thumbs.php
rename to library/attach_mod/includes/functions_thumbs.php
diff --git a/upload/library/attach_mod/posting_attachments.php b/library/attach_mod/posting_attachments.php
similarity index 100%
rename from upload/library/attach_mod/posting_attachments.php
rename to library/attach_mod/posting_attachments.php
diff --git a/upload/library/config.php b/library/config.php
similarity index 100%
rename from upload/library/config.php
rename to library/config.php
diff --git a/upload/library/includes/.htaccess b/library/includes/.htaccess
similarity index 100%
rename from upload/library/includes/.htaccess
rename to library/includes/.htaccess
diff --git a/upload/library/includes/api/sphinx.php b/library/includes/api/sphinx.php
similarity index 100%
rename from upload/library/includes/api/sphinx.php
rename to library/includes/api/sphinx.php
diff --git a/upload/library/includes/bbcode.php b/library/includes/bbcode.php
similarity index 100%
rename from upload/library/includes/bbcode.php
rename to library/includes/bbcode.php
diff --git a/upload/library/includes/captcha/.htaccess b/library/includes/captcha/.htaccess
similarity index 100%
rename from upload/library/includes/captcha/.htaccess
rename to library/includes/captcha/.htaccess
diff --git a/upload/library/includes/captcha/captcha.php b/library/includes/captcha/captcha.php
similarity index 100%
rename from upload/library/includes/captcha/captcha.php
rename to library/includes/captcha/captcha.php
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/antiqua.png b/library/includes/captcha/kcaptcha/fonts/antiqua.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/antiqua.png
rename to library/includes/captcha/kcaptcha/fonts/antiqua.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/baskerville.png b/library/includes/captcha/kcaptcha/fonts/baskerville.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/baskerville.png
rename to library/includes/captcha/kcaptcha/fonts/baskerville.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/batang.png b/library/includes/captcha/kcaptcha/fonts/batang.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/batang.png
rename to library/includes/captcha/kcaptcha/fonts/batang.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/bookman.png b/library/includes/captcha/kcaptcha/fonts/bookman.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/bookman.png
rename to library/includes/captcha/kcaptcha/fonts/bookman.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/calisto.png b/library/includes/captcha/kcaptcha/fonts/calisto.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/calisto.png
rename to library/includes/captcha/kcaptcha/fonts/calisto.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/cambria.png b/library/includes/captcha/kcaptcha/fonts/cambria.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/cambria.png
rename to library/includes/captcha/kcaptcha/fonts/cambria.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/centaur.png b/library/includes/captcha/kcaptcha/fonts/centaur.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/centaur.png
rename to library/includes/captcha/kcaptcha/fonts/centaur.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/century.png b/library/includes/captcha/kcaptcha/fonts/century.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/century.png
rename to library/includes/captcha/kcaptcha/fonts/century.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/chaparral.png b/library/includes/captcha/kcaptcha/fonts/chaparral.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/chaparral.png
rename to library/includes/captcha/kcaptcha/fonts/chaparral.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/constantia.png b/library/includes/captcha/kcaptcha/fonts/constantia.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/constantia.png
rename to library/includes/captcha/kcaptcha/fonts/constantia.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/footlight.png b/library/includes/captcha/kcaptcha/fonts/footlight.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/footlight.png
rename to library/includes/captcha/kcaptcha/fonts/footlight.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/garamond.png b/library/includes/captcha/kcaptcha/fonts/garamond.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/garamond.png
rename to library/includes/captcha/kcaptcha/fonts/garamond.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/georgia.png b/library/includes/captcha/kcaptcha/fonts/georgia.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/georgia.png
rename to library/includes/captcha/kcaptcha/fonts/georgia.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/goudy_old.png b/library/includes/captcha/kcaptcha/fonts/goudy_old.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/goudy_old.png
rename to library/includes/captcha/kcaptcha/fonts/goudy_old.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/kozuka.png b/library/includes/captcha/kcaptcha/fonts/kozuka.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/kozuka.png
rename to library/includes/captcha/kcaptcha/fonts/kozuka.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/lucida.png b/library/includes/captcha/kcaptcha/fonts/lucida.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/lucida.png
rename to library/includes/captcha/kcaptcha/fonts/lucida.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/minion.png b/library/includes/captcha/kcaptcha/fonts/minion.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/minion.png
rename to library/includes/captcha/kcaptcha/fonts/minion.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/palatino.png b/library/includes/captcha/kcaptcha/fonts/palatino.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/palatino.png
rename to library/includes/captcha/kcaptcha/fonts/palatino.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/perpetua.png b/library/includes/captcha/kcaptcha/fonts/perpetua.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/perpetua.png
rename to library/includes/captcha/kcaptcha/fonts/perpetua.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/rockwell.png b/library/includes/captcha/kcaptcha/fonts/rockwell.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/rockwell.png
rename to library/includes/captcha/kcaptcha/fonts/rockwell.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/times.png b/library/includes/captcha/kcaptcha/fonts/times.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/times.png
rename to library/includes/captcha/kcaptcha/fonts/times.png
diff --git a/upload/library/includes/captcha/kcaptcha/fonts/warnock.png b/library/includes/captcha/kcaptcha/fonts/warnock.png
similarity index 100%
rename from upload/library/includes/captcha/kcaptcha/fonts/warnock.png
rename to library/includes/captcha/kcaptcha/fonts/warnock.png
diff --git a/upload/library/includes/classes/.htaccess b/library/includes/classes/.htaccess
similarity index 100%
rename from upload/library/includes/classes/.htaccess
rename to library/includes/classes/.htaccess
diff --git a/upload/library/includes/classes/correct.php b/library/includes/classes/correct.php
similarity index 100%
rename from upload/library/includes/classes/correct.php
rename to library/includes/classes/correct.php
diff --git a/upload/library/includes/classes/emailer.php b/library/includes/classes/emailer.php
similarity index 100%
rename from upload/library/includes/classes/emailer.php
rename to library/includes/classes/emailer.php
diff --git a/upload/library/includes/classes/reflection.php b/library/includes/classes/reflection.php
similarity index 100%
rename from upload/library/includes/classes/reflection.php
rename to library/includes/classes/reflection.php
diff --git a/upload/library/includes/classes/sitemap.php b/library/includes/classes/sitemap.php
similarity index 100%
rename from upload/library/includes/classes/sitemap.php
rename to library/includes/classes/sitemap.php
diff --git a/upload/library/includes/classes/utf8.php b/library/includes/classes/utf8.php
similarity index 100%
rename from upload/library/includes/classes/utf8.php
rename to library/includes/classes/utf8.php
diff --git a/upload/library/includes/core/mysql.php b/library/includes/core/mysql.php
similarity index 100%
rename from upload/library/includes/core/mysql.php
rename to library/includes/core/mysql.php
diff --git a/upload/library/includes/cron/.htaccess b/library/includes/cron/.htaccess
similarity index 100%
rename from upload/library/includes/cron/.htaccess
rename to library/includes/cron/.htaccess
diff --git a/upload/library/includes/cron/cron_check.php b/library/includes/cron/cron_check.php
similarity index 100%
rename from upload/library/includes/cron/cron_check.php
rename to library/includes/cron/cron_check.php
diff --git a/upload/library/includes/cron/cron_init.php b/library/includes/cron/cron_init.php
similarity index 100%
rename from upload/library/includes/cron/cron_init.php
rename to library/includes/cron/cron_init.php
diff --git a/upload/library/includes/cron/cron_run.php b/library/includes/cron/cron_run.php
similarity index 100%
rename from upload/library/includes/cron/cron_run.php
rename to library/includes/cron/cron_run.php
diff --git a/upload/library/includes/cron/jobs/.htaccess b/library/includes/cron/jobs/.htaccess
similarity index 100%
rename from upload/library/includes/cron/jobs/.htaccess
rename to library/includes/cron/jobs/.htaccess
diff --git a/upload/library/includes/cron/jobs/attach_maintenance.php b/library/includes/cron/jobs/attach_maintenance.php
similarity index 100%
rename from upload/library/includes/cron/jobs/attach_maintenance.php
rename to library/includes/cron/jobs/attach_maintenance.php
diff --git a/upload/library/includes/cron/jobs/board_maintenance.php b/library/includes/cron/jobs/board_maintenance.php
similarity index 100%
rename from upload/library/includes/cron/jobs/board_maintenance.php
rename to library/includes/cron/jobs/board_maintenance.php
diff --git a/upload/library/includes/cron/jobs/cache_gc.php b/library/includes/cron/jobs/cache_gc.php
similarity index 100%
rename from upload/library/includes/cron/jobs/cache_gc.php
rename to library/includes/cron/jobs/cache_gc.php
diff --git a/upload/library/includes/cron/jobs/captcha_gen_gc.php b/library/includes/cron/jobs/captcha_gen_gc.php
similarity index 100%
rename from upload/library/includes/cron/jobs/captcha_gen_gc.php
rename to library/includes/cron/jobs/captcha_gen_gc.php
diff --git a/upload/library/includes/cron/jobs/clean_dlstat.php b/library/includes/cron/jobs/clean_dlstat.php
similarity index 100%
rename from upload/library/includes/cron/jobs/clean_dlstat.php
rename to library/includes/cron/jobs/clean_dlstat.php
diff --git a/upload/library/includes/cron/jobs/clean_log.php b/library/includes/cron/jobs/clean_log.php
similarity index 100%
rename from upload/library/includes/cron/jobs/clean_log.php
rename to library/includes/cron/jobs/clean_log.php
diff --git a/upload/library/includes/cron/jobs/clean_search_results.php b/library/includes/cron/jobs/clean_search_results.php
similarity index 100%
rename from upload/library/includes/cron/jobs/clean_search_results.php
rename to library/includes/cron/jobs/clean_search_results.php
diff --git a/upload/library/includes/cron/jobs/ds_update_cat_forums.php b/library/includes/cron/jobs/ds_update_cat_forums.php
similarity index 100%
rename from upload/library/includes/cron/jobs/ds_update_cat_forums.php
rename to library/includes/cron/jobs/ds_update_cat_forums.php
diff --git a/upload/library/includes/cron/jobs/ds_update_stats.php b/library/includes/cron/jobs/ds_update_stats.php
similarity index 100%
rename from upload/library/includes/cron/jobs/ds_update_stats.php
rename to library/includes/cron/jobs/ds_update_stats.php
diff --git a/upload/library/includes/cron/jobs/flash_topic_view.php b/library/includes/cron/jobs/flash_topic_view.php
similarity index 100%
rename from upload/library/includes/cron/jobs/flash_topic_view.php
rename to library/includes/cron/jobs/flash_topic_view.php
diff --git a/upload/library/includes/cron/jobs/prune_forums.php b/library/includes/cron/jobs/prune_forums.php
similarity index 100%
rename from upload/library/includes/cron/jobs/prune_forums.php
rename to library/includes/cron/jobs/prune_forums.php
diff --git a/upload/library/includes/cron/jobs/prune_inactive_users.php b/library/includes/cron/jobs/prune_inactive_users.php
similarity index 100%
rename from upload/library/includes/cron/jobs/prune_inactive_users.php
rename to library/includes/cron/jobs/prune_inactive_users.php
diff --git a/upload/library/includes/cron/jobs/prune_topic_moved.php b/library/includes/cron/jobs/prune_topic_moved.php
similarity index 100%
rename from upload/library/includes/cron/jobs/prune_topic_moved.php
rename to library/includes/cron/jobs/prune_topic_moved.php
diff --git a/upload/library/includes/cron/jobs/sessions_cleanup.php b/library/includes/cron/jobs/sessions_cleanup.php
similarity index 100%
rename from upload/library/includes/cron/jobs/sessions_cleanup.php
rename to library/includes/cron/jobs/sessions_cleanup.php
diff --git a/upload/library/includes/cron/jobs/sitemap.php b/library/includes/cron/jobs/sitemap.php
similarity index 100%
rename from upload/library/includes/cron/jobs/sitemap.php
rename to library/includes/cron/jobs/sitemap.php
diff --git a/upload/library/includes/cron/jobs/tr_cleanup_and_dlstat.php b/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
similarity index 100%
rename from upload/library/includes/cron/jobs/tr_cleanup_and_dlstat.php
rename to library/includes/cron/jobs/tr_cleanup_and_dlstat.php
diff --git a/upload/library/includes/cron/jobs/tr_complete_count.php b/library/includes/cron/jobs/tr_complete_count.php
similarity index 100%
rename from upload/library/includes/cron/jobs/tr_complete_count.php
rename to library/includes/cron/jobs/tr_complete_count.php
diff --git a/upload/library/includes/cron/jobs/tr_maintenance.php b/library/includes/cron/jobs/tr_maintenance.php
similarity index 100%
rename from upload/library/includes/cron/jobs/tr_maintenance.php
rename to library/includes/cron/jobs/tr_maintenance.php
diff --git a/upload/library/includes/cron/jobs/tr_make_snapshot.php b/library/includes/cron/jobs/tr_make_snapshot.php
similarity index 100%
rename from upload/library/includes/cron/jobs/tr_make_snapshot.php
rename to library/includes/cron/jobs/tr_make_snapshot.php
diff --git a/upload/library/includes/cron/jobs/tr_update_seeder_last_seen.php b/library/includes/cron/jobs/tr_update_seeder_last_seen.php
similarity index 100%
rename from upload/library/includes/cron/jobs/tr_update_seeder_last_seen.php
rename to library/includes/cron/jobs/tr_update_seeder_last_seen.php
diff --git a/upload/library/includes/cron/jobs/update_forums_atom.php b/library/includes/cron/jobs/update_forums_atom.php
similarity index 100%
rename from upload/library/includes/cron/jobs/update_forums_atom.php
rename to library/includes/cron/jobs/update_forums_atom.php
diff --git a/upload/library/includes/datastore/.htaccess b/library/includes/datastore/.htaccess
similarity index 100%
rename from upload/library/includes/datastore/.htaccess
rename to library/includes/datastore/.htaccess
diff --git a/upload/library/includes/datastore/build_attach_extensions.php b/library/includes/datastore/build_attach_extensions.php
similarity index 100%
rename from upload/library/includes/datastore/build_attach_extensions.php
rename to library/includes/datastore/build_attach_extensions.php
diff --git a/upload/library/includes/datastore/build_cat_forums.php b/library/includes/datastore/build_cat_forums.php
similarity index 100%
rename from upload/library/includes/datastore/build_cat_forums.php
rename to library/includes/datastore/build_cat_forums.php
diff --git a/upload/library/includes/datastore/build_moderators.php b/library/includes/datastore/build_moderators.php
similarity index 100%
rename from upload/library/includes/datastore/build_moderators.php
rename to library/includes/datastore/build_moderators.php
diff --git a/upload/library/includes/datastore/build_ranks.php b/library/includes/datastore/build_ranks.php
similarity index 100%
rename from upload/library/includes/datastore/build_ranks.php
rename to library/includes/datastore/build_ranks.php
diff --git a/upload/library/includes/datastore/build_smilies.php b/library/includes/datastore/build_smilies.php
similarity index 100%
rename from upload/library/includes/datastore/build_smilies.php
rename to library/includes/datastore/build_smilies.php
diff --git a/upload/library/includes/datastore/build_stats.php b/library/includes/datastore/build_stats.php
similarity index 100%
rename from upload/library/includes/datastore/build_stats.php
rename to library/includes/datastore/build_stats.php
diff --git a/upload/library/includes/functions.php b/library/includes/functions.php
similarity index 100%
rename from upload/library/includes/functions.php
rename to library/includes/functions.php
diff --git a/upload/library/includes/functions_admin.php b/library/includes/functions_admin.php
similarity index 100%
rename from upload/library/includes/functions_admin.php
rename to library/includes/functions_admin.php
diff --git a/upload/library/includes/functions_admin_cron.php b/library/includes/functions_admin_cron.php
similarity index 100%
rename from upload/library/includes/functions_admin_cron.php
rename to library/includes/functions_admin_cron.php
diff --git a/upload/library/includes/functions_admin_torrent.php b/library/includes/functions_admin_torrent.php
similarity index 100%
rename from upload/library/includes/functions_admin_torrent.php
rename to library/includes/functions_admin_torrent.php
diff --git a/upload/library/includes/functions_atom.php b/library/includes/functions_atom.php
similarity index 100%
rename from upload/library/includes/functions_atom.php
rename to library/includes/functions_atom.php
diff --git a/upload/library/includes/functions_dev.php b/library/includes/functions_dev.php
similarity index 100%
rename from upload/library/includes/functions_dev.php
rename to library/includes/functions_dev.php
diff --git a/upload/library/includes/functions_group.php b/library/includes/functions_group.php
similarity index 100%
rename from upload/library/includes/functions_group.php
rename to library/includes/functions_group.php
diff --git a/upload/library/includes/functions_post.php b/library/includes/functions_post.php
similarity index 100%
rename from upload/library/includes/functions_post.php
rename to library/includes/functions_post.php
diff --git a/upload/library/includes/functions_selects.php b/library/includes/functions_selects.php
similarity index 100%
rename from upload/library/includes/functions_selects.php
rename to library/includes/functions_selects.php
diff --git a/upload/library/includes/functions_torrent.php b/library/includes/functions_torrent.php
similarity index 100%
rename from upload/library/includes/functions_torrent.php
rename to library/includes/functions_torrent.php
diff --git a/upload/library/includes/functions_upload.php b/library/includes/functions_upload.php
similarity index 100%
rename from upload/library/includes/functions_upload.php
rename to library/includes/functions_upload.php
diff --git a/upload/library/includes/functions_validate.php b/library/includes/functions_validate.php
similarity index 100%
rename from upload/library/includes/functions_validate.php
rename to library/includes/functions_validate.php
diff --git a/upload/library/includes/init_bb.php b/library/includes/init_bb.php
similarity index 100%
rename from upload/library/includes/init_bb.php
rename to library/includes/init_bb.php
diff --git a/upload/library/includes/online_userlist.php b/library/includes/online_userlist.php
similarity index 100%
rename from upload/library/includes/online_userlist.php
rename to library/includes/online_userlist.php
diff --git a/upload/library/includes/page_footer.php b/library/includes/page_footer.php
similarity index 100%
rename from upload/library/includes/page_footer.php
rename to library/includes/page_footer.php
diff --git a/upload/library/includes/page_footer_dev.php b/library/includes/page_footer_dev.php
similarity index 100%
rename from upload/library/includes/page_footer_dev.php
rename to library/includes/page_footer_dev.php
diff --git a/upload/library/includes/page_header.php b/library/includes/page_header.php
similarity index 100%
rename from upload/library/includes/page_header.php
rename to library/includes/page_header.php
diff --git a/upload/library/includes/posting_tpl.php b/library/includes/posting_tpl.php
similarity index 100%
rename from upload/library/includes/posting_tpl.php
rename to library/includes/posting_tpl.php
diff --git a/upload/library/includes/sessions.php b/library/includes/sessions.php
similarity index 100%
rename from upload/library/includes/sessions.php
rename to library/includes/sessions.php
diff --git a/upload/library/includes/smtp.php b/library/includes/smtp.php
similarity index 100%
rename from upload/library/includes/smtp.php
rename to library/includes/smtp.php
diff --git a/upload/library/includes/sql_parse.php b/library/includes/sql_parse.php
similarity index 100%
rename from upload/library/includes/sql_parse.php
rename to library/includes/sql_parse.php
diff --git a/upload/library/includes/template.php b/library/includes/template.php
similarity index 100%
rename from upload/library/includes/template.php
rename to library/includes/template.php
diff --git a/upload/library/includes/torrent_announce_urls.php b/library/includes/torrent_announce_urls.php
similarity index 100%
rename from upload/library/includes/torrent_announce_urls.php
rename to library/includes/torrent_announce_urls.php
diff --git a/upload/library/includes/torrent_show_dl_list.php b/library/includes/torrent_show_dl_list.php
similarity index 100%
rename from upload/library/includes/torrent_show_dl_list.php
rename to library/includes/torrent_show_dl_list.php
diff --git a/upload/library/includes/ucp/.htaccess b/library/includes/ucp/.htaccess
similarity index 100%
rename from upload/library/includes/ucp/.htaccess
rename to library/includes/ucp/.htaccess
diff --git a/upload/library/includes/ucp/activate.php b/library/includes/ucp/activate.php
similarity index 100%
rename from upload/library/includes/ucp/activate.php
rename to library/includes/ucp/activate.php
diff --git a/upload/library/includes/ucp/bonus.php b/library/includes/ucp/bonus.php
similarity index 100%
rename from upload/library/includes/ucp/bonus.php
rename to library/includes/ucp/bonus.php
diff --git a/upload/library/includes/ucp/email.php b/library/includes/ucp/email.php
similarity index 100%
rename from upload/library/includes/ucp/email.php
rename to library/includes/ucp/email.php
diff --git a/upload/library/includes/ucp/register.php b/library/includes/ucp/register.php
similarity index 100%
rename from upload/library/includes/ucp/register.php
rename to library/includes/ucp/register.php
diff --git a/upload/library/includes/ucp/sendpasswd.php b/library/includes/ucp/sendpasswd.php
similarity index 100%
rename from upload/library/includes/ucp/sendpasswd.php
rename to library/includes/ucp/sendpasswd.php
diff --git a/upload/library/includes/ucp/topic_watch.php b/library/includes/ucp/topic_watch.php
similarity index 100%
rename from upload/library/includes/ucp/topic_watch.php
rename to library/includes/ucp/topic_watch.php
diff --git a/upload/library/includes/ucp/viewprofile.php b/library/includes/ucp/viewprofile.php
similarity index 100%
rename from upload/library/includes/ucp/viewprofile.php
rename to library/includes/ucp/viewprofile.php
diff --git a/upload/library/includes/ucp/viewtorrent.php b/library/includes/ucp/viewtorrent.php
similarity index 100%
rename from upload/library/includes/ucp/viewtorrent.php
rename to library/includes/ucp/viewtorrent.php
diff --git a/upload/library/language/.htaccess b/library/language/.htaccess
similarity index 100%
rename from upload/library/language/.htaccess
rename to library/language/.htaccess
diff --git a/upload/library/language/en/.htaccess b/library/language/en/.htaccess
similarity index 100%
rename from upload/library/language/en/.htaccess
rename to library/language/en/.htaccess
diff --git a/upload/library/language/en/email/.htaccess b/library/language/en/email/.htaccess
similarity index 100%
rename from upload/library/language/en/email/.htaccess
rename to library/language/en/email/.htaccess
diff --git a/upload/library/language/en/email/admin_send_email.tpl b/library/language/en/email/admin_send_email.tpl
similarity index 100%
rename from upload/library/language/en/email/admin_send_email.tpl
rename to library/language/en/email/admin_send_email.tpl
diff --git a/upload/library/language/en/email/blank.tpl b/library/language/en/email/blank.tpl
similarity index 100%
rename from upload/library/language/en/email/blank.tpl
rename to library/language/en/email/blank.tpl
diff --git a/upload/library/language/en/email/group_added.tpl b/library/language/en/email/group_added.tpl
similarity index 100%
rename from upload/library/language/en/email/group_added.tpl
rename to library/language/en/email/group_added.tpl
diff --git a/upload/library/language/en/email/group_approved.tpl b/library/language/en/email/group_approved.tpl
similarity index 100%
rename from upload/library/language/en/email/group_approved.tpl
rename to library/language/en/email/group_approved.tpl
diff --git a/upload/library/language/en/email/group_request.tpl b/library/language/en/email/group_request.tpl
similarity index 100%
rename from upload/library/language/en/email/group_request.tpl
rename to library/language/en/email/group_request.tpl
diff --git a/upload/library/language/en/email/privmsg_notify.tpl b/library/language/en/email/privmsg_notify.tpl
similarity index 100%
rename from upload/library/language/en/email/privmsg_notify.tpl
rename to library/language/en/email/privmsg_notify.tpl
diff --git a/upload/library/language/en/email/profile_send_email.tpl b/library/language/en/email/profile_send_email.tpl
similarity index 100%
rename from upload/library/language/en/email/profile_send_email.tpl
rename to library/language/en/email/profile_send_email.tpl
diff --git a/upload/library/language/en/email/topic_notify.tpl b/library/language/en/email/topic_notify.tpl
similarity index 100%
rename from upload/library/language/en/email/topic_notify.tpl
rename to library/language/en/email/topic_notify.tpl
diff --git a/upload/library/language/en/email/user_activate.tpl b/library/language/en/email/user_activate.tpl
similarity index 100%
rename from upload/library/language/en/email/user_activate.tpl
rename to library/language/en/email/user_activate.tpl
diff --git a/upload/library/language/en/email/user_activate_passwd.tpl b/library/language/en/email/user_activate_passwd.tpl
similarity index 100%
rename from upload/library/language/en/email/user_activate_passwd.tpl
rename to library/language/en/email/user_activate_passwd.tpl
diff --git a/upload/library/language/en/email/user_welcome.tpl b/library/language/en/email/user_welcome.tpl
similarity index 100%
rename from upload/library/language/en/email/user_welcome.tpl
rename to library/language/en/email/user_welcome.tpl
diff --git a/upload/library/language/en/email/user_welcome_inactive.tpl b/library/language/en/email/user_welcome_inactive.tpl
similarity index 100%
rename from upload/library/language/en/email/user_welcome_inactive.tpl
rename to library/language/en/email/user_welcome_inactive.tpl
diff --git a/upload/library/language/en/html/.htaccess b/library/language/en/html/.htaccess
similarity index 100%
rename from upload/library/language/en/html/.htaccess
rename to library/language/en/html/.htaccess
diff --git a/upload/library/language/en/html/advert.html b/library/language/en/html/advert.html
similarity index 100%
rename from upload/library/language/en/html/advert.html
rename to library/language/en/html/advert.html
diff --git a/upload/library/language/en/html/copyright_holders.html b/library/language/en/html/copyright_holders.html
similarity index 100%
rename from upload/library/language/en/html/copyright_holders.html
rename to library/language/en/html/copyright_holders.html
diff --git a/upload/library/language/en/html/not_found.html b/library/language/en/html/not_found.html
similarity index 100%
rename from upload/library/language/en/html/not_found.html
rename to library/language/en/html/not_found.html
diff --git a/upload/library/language/en/html/sidebar1.html b/library/language/en/html/sidebar1.html
similarity index 100%
rename from upload/library/language/en/html/sidebar1.html
rename to library/language/en/html/sidebar1.html
diff --git a/upload/library/language/en/html/sidebar2.html b/library/language/en/html/sidebar2.html
similarity index 100%
rename from upload/library/language/en/html/sidebar2.html
rename to library/language/en/html/sidebar2.html
diff --git a/upload/library/language/en/html/user_agreement.html b/library/language/en/html/user_agreement.html
similarity index 100%
rename from upload/library/language/en/html/user_agreement.html
rename to library/language/en/html/user_agreement.html
diff --git a/upload/library/language/en/main.php b/library/language/en/main.php
similarity index 100%
rename from upload/library/language/en/main.php
rename to library/language/en/main.php
diff --git a/upload/library/language/en/search_stopwords.txt b/library/language/en/search_stopwords.txt
similarity index 100%
rename from upload/library/language/en/search_stopwords.txt
rename to library/language/en/search_stopwords.txt
diff --git a/upload/library/language/en/search_synonyms.txt b/library/language/en/search_synonyms.txt
similarity index 100%
rename from upload/library/language/en/search_synonyms.txt
rename to library/language/en/search_synonyms.txt
diff --git a/upload/library/language/ru/.htaccess b/library/language/ru/.htaccess
similarity index 100%
rename from upload/library/language/ru/.htaccess
rename to library/language/ru/.htaccess
diff --git a/upload/library/language/ru/email/.htaccess b/library/language/ru/email/.htaccess
similarity index 100%
rename from upload/library/language/ru/email/.htaccess
rename to library/language/ru/email/.htaccess
diff --git a/upload/library/language/ru/email/admin_send_email.tpl b/library/language/ru/email/admin_send_email.tpl
similarity index 100%
rename from upload/library/language/ru/email/admin_send_email.tpl
rename to library/language/ru/email/admin_send_email.tpl
diff --git a/upload/library/language/ru/email/blank.tpl b/library/language/ru/email/blank.tpl
similarity index 100%
rename from upload/library/language/ru/email/blank.tpl
rename to library/language/ru/email/blank.tpl
diff --git a/upload/library/language/ru/email/group_added.tpl b/library/language/ru/email/group_added.tpl
similarity index 100%
rename from upload/library/language/ru/email/group_added.tpl
rename to library/language/ru/email/group_added.tpl
diff --git a/upload/library/language/ru/email/group_approved.tpl b/library/language/ru/email/group_approved.tpl
similarity index 100%
rename from upload/library/language/ru/email/group_approved.tpl
rename to library/language/ru/email/group_approved.tpl
diff --git a/upload/library/language/ru/email/group_request.tpl b/library/language/ru/email/group_request.tpl
similarity index 100%
rename from upload/library/language/ru/email/group_request.tpl
rename to library/language/ru/email/group_request.tpl
diff --git a/upload/library/language/ru/email/privmsg_notify.tpl b/library/language/ru/email/privmsg_notify.tpl
similarity index 100%
rename from upload/library/language/ru/email/privmsg_notify.tpl
rename to library/language/ru/email/privmsg_notify.tpl
diff --git a/upload/library/language/ru/email/profile_send_email.tpl b/library/language/ru/email/profile_send_email.tpl
similarity index 100%
rename from upload/library/language/ru/email/profile_send_email.tpl
rename to library/language/ru/email/profile_send_email.tpl
diff --git a/upload/library/language/ru/email/topic_notify.tpl b/library/language/ru/email/topic_notify.tpl
similarity index 100%
rename from upload/library/language/ru/email/topic_notify.tpl
rename to library/language/ru/email/topic_notify.tpl
diff --git a/upload/library/language/ru/email/user_activate.tpl b/library/language/ru/email/user_activate.tpl
similarity index 100%
rename from upload/library/language/ru/email/user_activate.tpl
rename to library/language/ru/email/user_activate.tpl
diff --git a/upload/library/language/ru/email/user_activate_passwd.tpl b/library/language/ru/email/user_activate_passwd.tpl
similarity index 100%
rename from upload/library/language/ru/email/user_activate_passwd.tpl
rename to library/language/ru/email/user_activate_passwd.tpl
diff --git a/upload/library/language/ru/email/user_welcome.tpl b/library/language/ru/email/user_welcome.tpl
similarity index 100%
rename from upload/library/language/ru/email/user_welcome.tpl
rename to library/language/ru/email/user_welcome.tpl
diff --git a/upload/library/language/ru/email/user_welcome_inactive.tpl b/library/language/ru/email/user_welcome_inactive.tpl
similarity index 100%
rename from upload/library/language/ru/email/user_welcome_inactive.tpl
rename to library/language/ru/email/user_welcome_inactive.tpl
diff --git a/upload/library/language/ru/html/.htaccess b/library/language/ru/html/.htaccess
similarity index 100%
rename from upload/library/language/ru/html/.htaccess
rename to library/language/ru/html/.htaccess
diff --git a/upload/library/language/ru/html/advert.html b/library/language/ru/html/advert.html
similarity index 100%
rename from upload/library/language/ru/html/advert.html
rename to library/language/ru/html/advert.html
diff --git a/upload/library/language/ru/html/copyright_holders.html b/library/language/ru/html/copyright_holders.html
similarity index 100%
rename from upload/library/language/ru/html/copyright_holders.html
rename to library/language/ru/html/copyright_holders.html
diff --git a/upload/library/language/ru/html/not_found.html b/library/language/ru/html/not_found.html
similarity index 100%
rename from upload/library/language/ru/html/not_found.html
rename to library/language/ru/html/not_found.html
diff --git a/upload/library/language/ru/html/sidebar1.html b/library/language/ru/html/sidebar1.html
similarity index 100%
rename from upload/library/language/ru/html/sidebar1.html
rename to library/language/ru/html/sidebar1.html
diff --git a/upload/library/language/ru/html/sidebar2.html b/library/language/ru/html/sidebar2.html
similarity index 100%
rename from upload/library/language/ru/html/sidebar2.html
rename to library/language/ru/html/sidebar2.html
diff --git a/upload/library/language/ru/html/user_agreement.html b/library/language/ru/html/user_agreement.html
similarity index 100%
rename from upload/library/language/ru/html/user_agreement.html
rename to library/language/ru/html/user_agreement.html
diff --git a/upload/library/language/ru/main.php b/library/language/ru/main.php
similarity index 100%
rename from upload/library/language/ru/main.php
rename to library/language/ru/main.php
diff --git a/upload/library/language/ru/search_stopwords.txt b/library/language/ru/search_stopwords.txt
similarity index 100%
rename from upload/library/language/ru/search_stopwords.txt
rename to library/language/ru/search_stopwords.txt
diff --git a/upload/library/language/ru/search_synonyms.txt b/library/language/ru/search_synonyms.txt
similarity index 100%
rename from upload/library/language/ru/search_synonyms.txt
rename to library/language/ru/search_synonyms.txt
diff --git a/upload/library/language/uk/.htaccess b/library/language/uk/.htaccess
similarity index 100%
rename from upload/library/language/uk/.htaccess
rename to library/language/uk/.htaccess
diff --git a/upload/library/language/uk/email/.htaccess b/library/language/uk/email/.htaccess
similarity index 100%
rename from upload/library/language/uk/email/.htaccess
rename to library/language/uk/email/.htaccess
diff --git a/upload/library/language/uk/email/admin_send_email.tpl b/library/language/uk/email/admin_send_email.tpl
similarity index 100%
rename from upload/library/language/uk/email/admin_send_email.tpl
rename to library/language/uk/email/admin_send_email.tpl
diff --git a/upload/library/language/uk/email/blank.tpl b/library/language/uk/email/blank.tpl
similarity index 100%
rename from upload/library/language/uk/email/blank.tpl
rename to library/language/uk/email/blank.tpl
diff --git a/upload/library/language/uk/email/group_added.tpl b/library/language/uk/email/group_added.tpl
similarity index 100%
rename from upload/library/language/uk/email/group_added.tpl
rename to library/language/uk/email/group_added.tpl
diff --git a/upload/library/language/uk/email/group_approved.tpl b/library/language/uk/email/group_approved.tpl
similarity index 100%
rename from upload/library/language/uk/email/group_approved.tpl
rename to library/language/uk/email/group_approved.tpl
diff --git a/upload/library/language/uk/email/group_request.tpl b/library/language/uk/email/group_request.tpl
similarity index 100%
rename from upload/library/language/uk/email/group_request.tpl
rename to library/language/uk/email/group_request.tpl
diff --git a/upload/library/language/uk/email/privmsg_notify.tpl b/library/language/uk/email/privmsg_notify.tpl
similarity index 100%
rename from upload/library/language/uk/email/privmsg_notify.tpl
rename to library/language/uk/email/privmsg_notify.tpl
diff --git a/upload/library/language/uk/email/profile_send_email.tpl b/library/language/uk/email/profile_send_email.tpl
similarity index 100%
rename from upload/library/language/uk/email/profile_send_email.tpl
rename to library/language/uk/email/profile_send_email.tpl
diff --git a/upload/library/language/uk/email/topic_notify.tpl b/library/language/uk/email/topic_notify.tpl
similarity index 100%
rename from upload/library/language/uk/email/topic_notify.tpl
rename to library/language/uk/email/topic_notify.tpl
diff --git a/upload/library/language/uk/email/user_activate.tpl b/library/language/uk/email/user_activate.tpl
similarity index 100%
rename from upload/library/language/uk/email/user_activate.tpl
rename to library/language/uk/email/user_activate.tpl
diff --git a/upload/library/language/uk/email/user_activate_passwd.tpl b/library/language/uk/email/user_activate_passwd.tpl
similarity index 100%
rename from upload/library/language/uk/email/user_activate_passwd.tpl
rename to library/language/uk/email/user_activate_passwd.tpl
diff --git a/upload/library/language/uk/email/user_welcome.tpl b/library/language/uk/email/user_welcome.tpl
similarity index 100%
rename from upload/library/language/uk/email/user_welcome.tpl
rename to library/language/uk/email/user_welcome.tpl
diff --git a/upload/library/language/uk/email/user_welcome_inactive.tpl b/library/language/uk/email/user_welcome_inactive.tpl
similarity index 100%
rename from upload/library/language/uk/email/user_welcome_inactive.tpl
rename to library/language/uk/email/user_welcome_inactive.tpl
diff --git a/upload/library/language/uk/html/.htaccess b/library/language/uk/html/.htaccess
similarity index 100%
rename from upload/library/language/uk/html/.htaccess
rename to library/language/uk/html/.htaccess
diff --git a/upload/library/language/uk/html/advert.html b/library/language/uk/html/advert.html
similarity index 100%
rename from upload/library/language/uk/html/advert.html
rename to library/language/uk/html/advert.html
diff --git a/upload/library/language/uk/html/copyright_holders.html b/library/language/uk/html/copyright_holders.html
similarity index 100%
rename from upload/library/language/uk/html/copyright_holders.html
rename to library/language/uk/html/copyright_holders.html
diff --git a/upload/library/language/uk/html/not_found.html b/library/language/uk/html/not_found.html
similarity index 100%
rename from upload/library/language/uk/html/not_found.html
rename to library/language/uk/html/not_found.html
diff --git a/upload/library/language/uk/html/sidebar1.html b/library/language/uk/html/sidebar1.html
similarity index 100%
rename from upload/library/language/uk/html/sidebar1.html
rename to library/language/uk/html/sidebar1.html
diff --git a/upload/library/language/uk/html/sidebar2.html b/library/language/uk/html/sidebar2.html
similarity index 100%
rename from upload/library/language/uk/html/sidebar2.html
rename to library/language/uk/html/sidebar2.html
diff --git a/upload/library/language/uk/html/user_agreement.html b/library/language/uk/html/user_agreement.html
similarity index 100%
rename from upload/library/language/uk/html/user_agreement.html
rename to library/language/uk/html/user_agreement.html
diff --git a/upload/library/language/uk/main.php b/library/language/uk/main.php
similarity index 100%
rename from upload/library/language/uk/main.php
rename to library/language/uk/main.php
diff --git a/upload/library/language/uk/search_stopwords.txt b/library/language/uk/search_stopwords.txt
similarity index 100%
rename from upload/library/language/uk/search_stopwords.txt
rename to library/language/uk/search_stopwords.txt
diff --git a/upload/library/language/uk/search_synonyms.txt b/library/language/uk/search_synonyms.txt
similarity index 100%
rename from upload/library/language/uk/search_synonyms.txt
rename to library/language/uk/search_synonyms.txt
diff --git a/upload/login.php b/login.php
similarity index 100%
rename from upload/login.php
rename to login.php
diff --git a/upload/memberlist.php b/memberlist.php
similarity index 100%
rename from upload/memberlist.php
rename to memberlist.php
diff --git a/upload/modcp.php b/modcp.php
similarity index 100%
rename from upload/modcp.php
rename to modcp.php
diff --git a/upload/opensearch_desc.xml b/opensearch_desc.xml
similarity index 100%
rename from upload/opensearch_desc.xml
rename to opensearch_desc.xml
diff --git a/upload/opensearch_desc_bt.xml b/opensearch_desc_bt.xml
similarity index 100%
rename from upload/opensearch_desc_bt.xml
rename to opensearch_desc_bt.xml
diff --git a/upload/poll.php b/poll.php
similarity index 100%
rename from upload/poll.php
rename to poll.php
diff --git a/upload/posting.php b/posting.php
similarity index 100%
rename from upload/posting.php
rename to posting.php
diff --git a/upload/privmsg.php b/privmsg.php
similarity index 100%
rename from upload/privmsg.php
rename to privmsg.php
diff --git a/upload/profile.php b/profile.php
similarity index 100%
rename from upload/profile.php
rename to profile.php
diff --git a/upload/robots.txt b/robots.txt
similarity index 100%
rename from upload/robots.txt
rename to robots.txt
diff --git a/upload/search.php b/search.php
similarity index 100%
rename from upload/search.php
rename to search.php
diff --git a/upload/styles/bootstrap/css/bootstrap-theme.css b/styles/bootstrap/css/bootstrap-theme.css
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap-theme.css
rename to styles/bootstrap/css/bootstrap-theme.css
diff --git a/upload/styles/bootstrap/css/bootstrap-theme.css.map b/styles/bootstrap/css/bootstrap-theme.css.map
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap-theme.css.map
rename to styles/bootstrap/css/bootstrap-theme.css.map
diff --git a/upload/styles/bootstrap/css/bootstrap-theme.min.css b/styles/bootstrap/css/bootstrap-theme.min.css
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap-theme.min.css
rename to styles/bootstrap/css/bootstrap-theme.min.css
diff --git a/upload/styles/bootstrap/css/bootstrap.css b/styles/bootstrap/css/bootstrap.css
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap.css
rename to styles/bootstrap/css/bootstrap.css
diff --git a/upload/styles/bootstrap/css/bootstrap.css.map b/styles/bootstrap/css/bootstrap.css.map
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap.css.map
rename to styles/bootstrap/css/bootstrap.css.map
diff --git a/upload/styles/bootstrap/css/bootstrap.min.css b/styles/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from upload/styles/bootstrap/css/bootstrap.min.css
rename to styles/bootstrap/css/bootstrap.min.css
diff --git a/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.eot b/styles/bootstrap/fonts/glyphicons-halflings-regular.eot
similarity index 100%
rename from upload/styles/bootstrap/fonts/glyphicons-halflings-regular.eot
rename to styles/bootstrap/fonts/glyphicons-halflings-regular.eot
diff --git a/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.svg b/styles/bootstrap/fonts/glyphicons-halflings-regular.svg
similarity index 100%
rename from upload/styles/bootstrap/fonts/glyphicons-halflings-regular.svg
rename to styles/bootstrap/fonts/glyphicons-halflings-regular.svg
diff --git a/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.ttf b/styles/bootstrap/fonts/glyphicons-halflings-regular.ttf
similarity index 100%
rename from upload/styles/bootstrap/fonts/glyphicons-halflings-regular.ttf
rename to styles/bootstrap/fonts/glyphicons-halflings-regular.ttf
diff --git a/upload/styles/bootstrap/fonts/glyphicons-halflings-regular.woff b/styles/bootstrap/fonts/glyphicons-halflings-regular.woff
similarity index 100%
rename from upload/styles/bootstrap/fonts/glyphicons-halflings-regular.woff
rename to styles/bootstrap/fonts/glyphicons-halflings-regular.woff
diff --git a/upload/styles/bootstrap/js/bootstrap.js b/styles/bootstrap/js/bootstrap.js
similarity index 100%
rename from upload/styles/bootstrap/js/bootstrap.js
rename to styles/bootstrap/js/bootstrap.js
diff --git a/upload/styles/bootstrap/js/bootstrap.min.js b/styles/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from upload/styles/bootstrap/js/bootstrap.min.js
rename to styles/bootstrap/js/bootstrap.min.js
diff --git a/upload/styles/images/bad.gif b/styles/images/bad.gif
similarity index 100%
rename from upload/styles/images/bad.gif
rename to styles/images/bad.gif
diff --git a/upload/styles/images/dc_magnet.png b/styles/images/dc_magnet.png
similarity index 100%
rename from upload/styles/images/dc_magnet.png
rename to styles/images/dc_magnet.png
diff --git a/upload/styles/images/dc_magnet_ext.png b/styles/images/dc_magnet_ext.png
similarity index 100%
rename from upload/styles/images/dc_magnet_ext.png
rename to styles/images/dc_magnet_ext.png
diff --git a/upload/styles/images/folder.gif b/styles/images/folder.gif
similarity index 100%
rename from upload/styles/images/folder.gif
rename to styles/images/folder.gif
diff --git a/upload/styles/images/good.gif b/styles/images/good.gif
similarity index 100%
rename from upload/styles/images/good.gif
rename to styles/images/good.gif
diff --git a/upload/styles/images/icon_clip.gif b/styles/images/icon_clip.gif
similarity index 100%
rename from upload/styles/images/icon_clip.gif
rename to styles/images/icon_clip.gif
diff --git a/upload/styles/images/icon_delete.gif b/styles/images/icon_delete.gif
similarity index 100%
rename from upload/styles/images/icon_delete.gif
rename to styles/images/icon_delete.gif
diff --git a/upload/styles/images/icon_dn.gif b/styles/images/icon_dn.gif
similarity index 100%
rename from upload/styles/images/icon_dn.gif
rename to styles/images/icon_dn.gif
diff --git a/upload/styles/images/icon_edit.gif b/styles/images/icon_edit.gif
similarity index 100%
rename from upload/styles/images/icon_edit.gif
rename to styles/images/icon_edit.gif
diff --git a/upload/styles/images/icon_external.png b/styles/images/icon_external.png
similarity index 100%
rename from upload/styles/images/icon_external.png
rename to styles/images/icon_external.png
diff --git a/upload/styles/images/icon_run.gif b/styles/images/icon_run.gif
similarity index 100%
rename from upload/styles/images/icon_run.gif
rename to styles/images/icon_run.gif
diff --git a/upload/styles/images/icon_sync.gif b/styles/images/icon_sync.gif
similarity index 100%
rename from upload/styles/images/icon_sync.gif
rename to styles/images/icon_sync.gif
diff --git a/upload/styles/images/logo/logo.png b/styles/images/logo/logo.png
similarity index 100%
rename from upload/styles/images/logo/logo.png
rename to styles/images/logo/logo.png
diff --git a/upload/styles/images/logo/logo_summer.png b/styles/images/logo/logo_summer.png
similarity index 100%
rename from upload/styles/images/logo/logo_summer.png
rename to styles/images/logo/logo_summer.png
diff --git a/upload/styles/images/magnet.png b/styles/images/magnet.png
similarity index 100%
rename from upload/styles/images/magnet.png
rename to styles/images/magnet.png
diff --git a/upload/styles/images/page.gif b/styles/images/page.gif
similarity index 100%
rename from upload/styles/images/page.gif
rename to styles/images/page.gif
diff --git a/upload/styles/images/pic_loading.gif b/styles/images/pic_loading.gif
similarity index 100%
rename from upload/styles/images/pic_loading.gif
rename to styles/images/pic_loading.gif
diff --git a/upload/styles/images/ranks/admin.png b/styles/images/ranks/admin.png
similarity index 100%
rename from upload/styles/images/ranks/admin.png
rename to styles/images/ranks/admin.png
diff --git a/upload/styles/images/ranks/user.png b/styles/images/ranks/user.png
similarity index 100%
rename from upload/styles/images/ranks/user.png
rename to styles/images/ranks/user.png
diff --git a/upload/styles/images/smiles/aa.gif b/styles/images/smiles/aa.gif
similarity index 100%
rename from upload/styles/images/smiles/aa.gif
rename to styles/images/smiles/aa.gif
diff --git a/upload/styles/images/smiles/ab.gif b/styles/images/smiles/ab.gif
similarity index 100%
rename from upload/styles/images/smiles/ab.gif
rename to styles/images/smiles/ab.gif
diff --git a/upload/styles/images/smiles/ac.gif b/styles/images/smiles/ac.gif
similarity index 100%
rename from upload/styles/images/smiles/ac.gif
rename to styles/images/smiles/ac.gif
diff --git a/upload/styles/images/smiles/ad.gif b/styles/images/smiles/ad.gif
similarity index 100%
rename from upload/styles/images/smiles/ad.gif
rename to styles/images/smiles/ad.gif
diff --git a/upload/styles/images/smiles/ae.gif b/styles/images/smiles/ae.gif
similarity index 100%
rename from upload/styles/images/smiles/ae.gif
rename to styles/images/smiles/ae.gif
diff --git a/upload/styles/images/smiles/af.gif b/styles/images/smiles/af.gif
similarity index 100%
rename from upload/styles/images/smiles/af.gif
rename to styles/images/smiles/af.gif
diff --git a/upload/styles/images/smiles/ag.gif b/styles/images/smiles/ag.gif
similarity index 100%
rename from upload/styles/images/smiles/ag.gif
rename to styles/images/smiles/ag.gif
diff --git a/upload/styles/images/smiles/ah.gif b/styles/images/smiles/ah.gif
similarity index 100%
rename from upload/styles/images/smiles/ah.gif
rename to styles/images/smiles/ah.gif
diff --git a/upload/styles/images/smiles/ai.gif b/styles/images/smiles/ai.gif
similarity index 100%
rename from upload/styles/images/smiles/ai.gif
rename to styles/images/smiles/ai.gif
diff --git a/upload/styles/images/smiles/aj.gif b/styles/images/smiles/aj.gif
similarity index 100%
rename from upload/styles/images/smiles/aj.gif
rename to styles/images/smiles/aj.gif
diff --git a/upload/styles/images/smiles/ak.gif b/styles/images/smiles/ak.gif
similarity index 100%
rename from upload/styles/images/smiles/ak.gif
rename to styles/images/smiles/ak.gif
diff --git a/upload/styles/images/smiles/al.gif b/styles/images/smiles/al.gif
similarity index 100%
rename from upload/styles/images/smiles/al.gif
rename to styles/images/smiles/al.gif
diff --git a/upload/styles/images/smiles/am.gif b/styles/images/smiles/am.gif
similarity index 100%
rename from upload/styles/images/smiles/am.gif
rename to styles/images/smiles/am.gif
diff --git a/upload/styles/images/smiles/an.gif b/styles/images/smiles/an.gif
similarity index 100%
rename from upload/styles/images/smiles/an.gif
rename to styles/images/smiles/an.gif
diff --git a/upload/styles/images/smiles/ao.gif b/styles/images/smiles/ao.gif
similarity index 100%
rename from upload/styles/images/smiles/ao.gif
rename to styles/images/smiles/ao.gif
diff --git a/upload/styles/images/smiles/ap.gif b/styles/images/smiles/ap.gif
similarity index 100%
rename from upload/styles/images/smiles/ap.gif
rename to styles/images/smiles/ap.gif
diff --git a/upload/styles/images/smiles/aq.gif b/styles/images/smiles/aq.gif
similarity index 100%
rename from upload/styles/images/smiles/aq.gif
rename to styles/images/smiles/aq.gif
diff --git a/upload/styles/images/smiles/ar.gif b/styles/images/smiles/ar.gif
similarity index 100%
rename from upload/styles/images/smiles/ar.gif
rename to styles/images/smiles/ar.gif
diff --git a/upload/styles/images/smiles/as.gif b/styles/images/smiles/as.gif
similarity index 100%
rename from upload/styles/images/smiles/as.gif
rename to styles/images/smiles/as.gif
diff --git a/upload/styles/images/smiles/at.gif b/styles/images/smiles/at.gif
similarity index 100%
rename from upload/styles/images/smiles/at.gif
rename to styles/images/smiles/at.gif
diff --git a/upload/styles/images/smiles/au.gif b/styles/images/smiles/au.gif
similarity index 100%
rename from upload/styles/images/smiles/au.gif
rename to styles/images/smiles/au.gif
diff --git a/upload/styles/images/smiles/av.gif b/styles/images/smiles/av.gif
similarity index 100%
rename from upload/styles/images/smiles/av.gif
rename to styles/images/smiles/av.gif
diff --git a/upload/styles/images/smiles/aw.gif b/styles/images/smiles/aw.gif
similarity index 100%
rename from upload/styles/images/smiles/aw.gif
rename to styles/images/smiles/aw.gif
diff --git a/upload/styles/images/smiles/ax.gif b/styles/images/smiles/ax.gif
similarity index 100%
rename from upload/styles/images/smiles/ax.gif
rename to styles/images/smiles/ax.gif
diff --git a/upload/styles/images/smiles/ay.gif b/styles/images/smiles/ay.gif
similarity index 100%
rename from upload/styles/images/smiles/ay.gif
rename to styles/images/smiles/ay.gif
diff --git a/upload/styles/images/smiles/az.gif b/styles/images/smiles/az.gif
similarity index 100%
rename from upload/styles/images/smiles/az.gif
rename to styles/images/smiles/az.gif
diff --git a/upload/styles/images/smiles/ba.gif b/styles/images/smiles/ba.gif
similarity index 100%
rename from upload/styles/images/smiles/ba.gif
rename to styles/images/smiles/ba.gif
diff --git a/upload/styles/images/smiles/bb.gif b/styles/images/smiles/bb.gif
similarity index 100%
rename from upload/styles/images/smiles/bb.gif
rename to styles/images/smiles/bb.gif
diff --git a/upload/styles/images/smiles/bc.gif b/styles/images/smiles/bc.gif
similarity index 100%
rename from upload/styles/images/smiles/bc.gif
rename to styles/images/smiles/bc.gif
diff --git a/upload/styles/images/smiles/bd.gif b/styles/images/smiles/bd.gif
similarity index 100%
rename from upload/styles/images/smiles/bd.gif
rename to styles/images/smiles/bd.gif
diff --git a/upload/styles/images/smiles/be.gif b/styles/images/smiles/be.gif
similarity index 100%
rename from upload/styles/images/smiles/be.gif
rename to styles/images/smiles/be.gif
diff --git a/upload/styles/images/smiles/bf.gif b/styles/images/smiles/bf.gif
similarity index 100%
rename from upload/styles/images/smiles/bf.gif
rename to styles/images/smiles/bf.gif
diff --git a/upload/styles/images/smiles/bg.gif b/styles/images/smiles/bg.gif
similarity index 100%
rename from upload/styles/images/smiles/bg.gif
rename to styles/images/smiles/bg.gif
diff --git a/upload/styles/images/smiles/bh.gif b/styles/images/smiles/bh.gif
similarity index 100%
rename from upload/styles/images/smiles/bh.gif
rename to styles/images/smiles/bh.gif
diff --git a/upload/styles/images/smiles/bi.gif b/styles/images/smiles/bi.gif
similarity index 100%
rename from upload/styles/images/smiles/bi.gif
rename to styles/images/smiles/bi.gif
diff --git a/upload/styles/images/smiles/bj.gif b/styles/images/smiles/bj.gif
similarity index 100%
rename from upload/styles/images/smiles/bj.gif
rename to styles/images/smiles/bj.gif
diff --git a/upload/styles/images/smiles/bk.gif b/styles/images/smiles/bk.gif
similarity index 100%
rename from upload/styles/images/smiles/bk.gif
rename to styles/images/smiles/bk.gif
diff --git a/upload/styles/images/smiles/bl.gif b/styles/images/smiles/bl.gif
similarity index 100%
rename from upload/styles/images/smiles/bl.gif
rename to styles/images/smiles/bl.gif
diff --git a/upload/styles/images/smiles/bm.gif b/styles/images/smiles/bm.gif
similarity index 100%
rename from upload/styles/images/smiles/bm.gif
rename to styles/images/smiles/bm.gif
diff --git a/upload/styles/images/smiles/bn.gif b/styles/images/smiles/bn.gif
similarity index 100%
rename from upload/styles/images/smiles/bn.gif
rename to styles/images/smiles/bn.gif
diff --git a/upload/styles/images/smiles/bo.gif b/styles/images/smiles/bo.gif
similarity index 100%
rename from upload/styles/images/smiles/bo.gif
rename to styles/images/smiles/bo.gif
diff --git a/upload/styles/images/smiles/bp.gif b/styles/images/smiles/bp.gif
similarity index 100%
rename from upload/styles/images/smiles/bp.gif
rename to styles/images/smiles/bp.gif
diff --git a/upload/styles/images/smiles/bq.gif b/styles/images/smiles/bq.gif
similarity index 100%
rename from upload/styles/images/smiles/bq.gif
rename to styles/images/smiles/bq.gif
diff --git a/upload/styles/images/smiles/br.gif b/styles/images/smiles/br.gif
similarity index 100%
rename from upload/styles/images/smiles/br.gif
rename to styles/images/smiles/br.gif
diff --git a/upload/styles/images/smiles/bs.gif b/styles/images/smiles/bs.gif
similarity index 100%
rename from upload/styles/images/smiles/bs.gif
rename to styles/images/smiles/bs.gif
diff --git a/upload/styles/images/smiles/bt.gif b/styles/images/smiles/bt.gif
similarity index 100%
rename from upload/styles/images/smiles/bt.gif
rename to styles/images/smiles/bt.gif
diff --git a/upload/styles/images/smiles/bu.gif b/styles/images/smiles/bu.gif
similarity index 100%
rename from upload/styles/images/smiles/bu.gif
rename to styles/images/smiles/bu.gif
diff --git a/upload/styles/images/smiles/bv.gif b/styles/images/smiles/bv.gif
similarity index 100%
rename from upload/styles/images/smiles/bv.gif
rename to styles/images/smiles/bv.gif
diff --git a/upload/styles/images/smiles/bw.gif b/styles/images/smiles/bw.gif
similarity index 100%
rename from upload/styles/images/smiles/bw.gif
rename to styles/images/smiles/bw.gif
diff --git a/upload/styles/images/smiles/bx.gif b/styles/images/smiles/bx.gif
similarity index 100%
rename from upload/styles/images/smiles/bx.gif
rename to styles/images/smiles/bx.gif
diff --git a/upload/styles/images/smiles/by.gif b/styles/images/smiles/by.gif
similarity index 100%
rename from upload/styles/images/smiles/by.gif
rename to styles/images/smiles/by.gif
diff --git a/upload/styles/images/smiles/bz.gif b/styles/images/smiles/bz.gif
similarity index 100%
rename from upload/styles/images/smiles/bz.gif
rename to styles/images/smiles/bz.gif
diff --git a/upload/styles/images/smiles/ca.gif b/styles/images/smiles/ca.gif
similarity index 100%
rename from upload/styles/images/smiles/ca.gif
rename to styles/images/smiles/ca.gif
diff --git a/upload/styles/images/smiles/cb.gif b/styles/images/smiles/cb.gif
similarity index 100%
rename from upload/styles/images/smiles/cb.gif
rename to styles/images/smiles/cb.gif
diff --git a/upload/styles/images/smiles/cc.gif b/styles/images/smiles/cc.gif
similarity index 100%
rename from upload/styles/images/smiles/cc.gif
rename to styles/images/smiles/cc.gif
diff --git a/upload/styles/images/smiles/tr_oops.gif b/styles/images/smiles/tr_oops.gif
similarity index 100%
rename from upload/styles/images/smiles/tr_oops.gif
rename to styles/images/smiles/tr_oops.gif
diff --git a/upload/styles/images/spacer.gif b/styles/images/spacer.gif
similarity index 100%
rename from upload/styles/images/spacer.gif
rename to styles/images/spacer.gif
diff --git a/upload/styles/images/tor_gold.gif b/styles/images/tor_gold.gif
similarity index 100%
rename from upload/styles/images/tor_gold.gif
rename to styles/images/tor_gold.gif
diff --git a/upload/styles/images/tor_silver.gif b/styles/images/tor_silver.gif
similarity index 100%
rename from upload/styles/images/tor_silver.gif
rename to styles/images/tor_silver.gif
diff --git a/upload/styles/images/user_offline.gif b/styles/images/user_offline.gif
similarity index 100%
rename from upload/styles/images/user_offline.gif
rename to styles/images/user_offline.gif
diff --git a/upload/styles/images/user_online.gif b/styles/images/user_online.gif
similarity index 100%
rename from upload/styles/images/user_online.gif
rename to styles/images/user_online.gif
diff --git a/upload/styles/js/bbcode.js b/styles/js/bbcode.js
similarity index 100%
rename from upload/styles/js/bbcode.js
rename to styles/js/bbcode.js
diff --git a/upload/styles/js/jquery.pack.js b/styles/js/jquery.pack.js
similarity index 100%
rename from upload/styles/js/jquery.pack.js
rename to styles/js/jquery.pack.js
diff --git a/upload/styles/js/main.js b/styles/js/main.js
similarity index 100%
rename from upload/styles/js/main.js
rename to styles/js/main.js
diff --git a/upload/styles/templates/admin/admin_attach_cp.tpl b/styles/templates/admin/admin_attach_cp.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_attach_cp.tpl
rename to styles/templates/admin/admin_attach_cp.tpl
diff --git a/upload/styles/templates/admin/admin_attachments.tpl b/styles/templates/admin/admin_attachments.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_attachments.tpl
rename to styles/templates/admin/admin_attachments.tpl
diff --git a/upload/styles/templates/admin/admin_board.tpl b/styles/templates/admin/admin_board.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_board.tpl
rename to styles/templates/admin/admin_board.tpl
diff --git a/upload/styles/templates/admin/admin_bt_forum_cfg.tpl b/styles/templates/admin/admin_bt_forum_cfg.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_bt_forum_cfg.tpl
rename to styles/templates/admin/admin_bt_forum_cfg.tpl
diff --git a/upload/styles/templates/admin/admin_bt_tracker_cfg.tpl b/styles/templates/admin/admin_bt_tracker_cfg.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_bt_tracker_cfg.tpl
rename to styles/templates/admin/admin_bt_tracker_cfg.tpl
diff --git a/upload/styles/templates/admin/admin_cron.tpl b/styles/templates/admin/admin_cron.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_cron.tpl
rename to styles/templates/admin/admin_cron.tpl
diff --git a/upload/styles/templates/admin/admin_disallow.tpl b/styles/templates/admin/admin_disallow.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_disallow.tpl
rename to styles/templates/admin/admin_disallow.tpl
diff --git a/upload/styles/templates/admin/admin_extensions.tpl b/styles/templates/admin/admin_extensions.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_extensions.tpl
rename to styles/templates/admin/admin_extensions.tpl
diff --git a/upload/styles/templates/admin/admin_forum_prune.tpl b/styles/templates/admin/admin_forum_prune.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_forum_prune.tpl
rename to styles/templates/admin/admin_forum_prune.tpl
diff --git a/upload/styles/templates/admin/admin_forumauth.tpl b/styles/templates/admin/admin_forumauth.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_forumauth.tpl
rename to styles/templates/admin/admin_forumauth.tpl
diff --git a/upload/styles/templates/admin/admin_forumauth_list.tpl b/styles/templates/admin/admin_forumauth_list.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_forumauth_list.tpl
rename to styles/templates/admin/admin_forumauth_list.tpl
diff --git a/upload/styles/templates/admin/admin_forums.tpl b/styles/templates/admin/admin_forums.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_forums.tpl
rename to styles/templates/admin/admin_forums.tpl
diff --git a/upload/styles/templates/admin/admin_groups.tpl b/styles/templates/admin/admin_groups.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_groups.tpl
rename to styles/templates/admin/admin_groups.tpl
diff --git a/upload/styles/templates/admin/admin_log.tpl b/styles/templates/admin/admin_log.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_log.tpl
rename to styles/templates/admin/admin_log.tpl
diff --git a/upload/styles/templates/admin/admin_mass_email.tpl b/styles/templates/admin/admin_mass_email.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_mass_email.tpl
rename to styles/templates/admin/admin_mass_email.tpl
diff --git a/upload/styles/templates/admin/admin_ranks.tpl b/styles/templates/admin/admin_ranks.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_ranks.tpl
rename to styles/templates/admin/admin_ranks.tpl
diff --git a/upload/styles/templates/admin/admin_rebuild_search.tpl b/styles/templates/admin/admin_rebuild_search.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_rebuild_search.tpl
rename to styles/templates/admin/admin_rebuild_search.tpl
diff --git a/upload/styles/templates/admin/admin_sitemap.tpl b/styles/templates/admin/admin_sitemap.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_sitemap.tpl
rename to styles/templates/admin/admin_sitemap.tpl
diff --git a/upload/styles/templates/admin/admin_smilies.tpl b/styles/templates/admin/admin_smilies.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_smilies.tpl
rename to styles/templates/admin/admin_smilies.tpl
diff --git a/upload/styles/templates/admin/admin_terms.tpl b/styles/templates/admin/admin_terms.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_terms.tpl
rename to styles/templates/admin/admin_terms.tpl
diff --git a/upload/styles/templates/admin/admin_ug_auth.tpl b/styles/templates/admin/admin_ug_auth.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_ug_auth.tpl
rename to styles/templates/admin/admin_ug_auth.tpl
diff --git a/upload/styles/templates/admin/admin_user_ban.tpl b/styles/templates/admin/admin_user_ban.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_user_ban.tpl
rename to styles/templates/admin/admin_user_ban.tpl
diff --git a/upload/styles/templates/admin/admin_user_search.tpl b/styles/templates/admin/admin_user_search.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_user_search.tpl
rename to styles/templates/admin/admin_user_search.tpl
diff --git a/upload/styles/templates/admin/admin_words.tpl b/styles/templates/admin/admin_words.tpl
similarity index 100%
rename from upload/styles/templates/admin/admin_words.tpl
rename to styles/templates/admin/admin_words.tpl
diff --git a/upload/styles/templates/admin/index.tpl b/styles/templates/admin/index.tpl
similarity index 100%
rename from upload/styles/templates/admin/index.tpl
rename to styles/templates/admin/index.tpl
diff --git a/upload/styles/templates/default/common.tpl b/styles/templates/default/common.tpl
similarity index 100%
rename from upload/styles/templates/default/common.tpl
rename to styles/templates/default/common.tpl
diff --git a/upload/styles/templates/default/css/admin.css b/styles/templates/default/css/admin.css
similarity index 100%
rename from upload/styles/templates/default/css/admin.css
rename to styles/templates/default/css/admin.css
diff --git a/upload/styles/templates/default/css/main.css b/styles/templates/default/css/main.css
similarity index 100%
rename from upload/styles/templates/default/css/main.css
rename to styles/templates/default/css/main.css
diff --git a/upload/styles/templates/default/group.tpl b/styles/templates/default/group.tpl
similarity index 100%
rename from upload/styles/templates/default/group.tpl
rename to styles/templates/default/group.tpl
diff --git a/upload/styles/templates/default/group_edit.tpl b/styles/templates/default/group_edit.tpl
similarity index 100%
rename from upload/styles/templates/default/group_edit.tpl
rename to styles/templates/default/group_edit.tpl
diff --git a/upload/styles/templates/default/images/aerobg.png b/styles/templates/default/images/aerobg.png
similarity index 100%
rename from upload/styles/templates/default/images/aerobg.png
rename to styles/templates/default/images/aerobg.png
diff --git a/upload/styles/templates/default/images/arrow1.gif b/styles/templates/default/images/arrow1.gif
similarity index 100%
rename from upload/styles/templates/default/images/arrow1.gif
rename to styles/templates/default/images/arrow1.gif
diff --git a/upload/styles/templates/default/images/button.gif b/styles/templates/default/images/button.gif
similarity index 100%
rename from upload/styles/templates/default/images/button.gif
rename to styles/templates/default/images/button.gif
diff --git a/upload/styles/templates/default/images/cellpic.gif b/styles/templates/default/images/cellpic.gif
similarity index 100%
rename from upload/styles/templates/default/images/cellpic.gif
rename to styles/templates/default/images/cellpic.gif
diff --git a/upload/styles/templates/default/images/cellpic1.gif b/styles/templates/default/images/cellpic1.gif
similarity index 100%
rename from upload/styles/templates/default/images/cellpic1.gif
rename to styles/templates/default/images/cellpic1.gif
diff --git a/upload/styles/templates/default/images/def_button.png b/styles/templates/default/images/def_button.png
similarity index 100%
rename from upload/styles/templates/default/images/def_button.png
rename to styles/templates/default/images/def_button.png
diff --git a/upload/styles/templates/default/images/def_button_light.png b/styles/templates/default/images/def_button_light.png
similarity index 100%
rename from upload/styles/templates/default/images/def_button_light.png
rename to styles/templates/default/images/def_button_light.png
diff --git a/upload/styles/templates/default/images/feed.png b/styles/templates/default/images/feed.png
similarity index 100%
rename from upload/styles/templates/default/images/feed.png
rename to styles/templates/default/images/feed.png
diff --git a/upload/styles/templates/default/images/folder.gif b/styles/templates/default/images/folder.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder.gif
rename to styles/templates/default/images/folder.gif
diff --git a/upload/styles/templates/default/images/folder_announce.gif b/styles/templates/default/images/folder_announce.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_announce.gif
rename to styles/templates/default/images/folder_announce.gif
diff --git a/upload/styles/templates/default/images/folder_announce_new.gif b/styles/templates/default/images/folder_announce_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_announce_new.gif
rename to styles/templates/default/images/folder_announce_new.gif
diff --git a/upload/styles/templates/default/images/folder_big.gif b/styles/templates/default/images/folder_big.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_big.gif
rename to styles/templates/default/images/folder_big.gif
diff --git a/upload/styles/templates/default/images/folder_dl.gif b/styles/templates/default/images/folder_dl.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_dl.gif
rename to styles/templates/default/images/folder_dl.gif
diff --git a/upload/styles/templates/default/images/folder_dl_hot.gif b/styles/templates/default/images/folder_dl_hot.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_dl_hot.gif
rename to styles/templates/default/images/folder_dl_hot.gif
diff --git a/upload/styles/templates/default/images/folder_dl_hot_new.gif b/styles/templates/default/images/folder_dl_hot_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_dl_hot_new.gif
rename to styles/templates/default/images/folder_dl_hot_new.gif
diff --git a/upload/styles/templates/default/images/folder_dl_new.gif b/styles/templates/default/images/folder_dl_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_dl_new.gif
rename to styles/templates/default/images/folder_dl_new.gif
diff --git a/upload/styles/templates/default/images/folder_hot.gif b/styles/templates/default/images/folder_hot.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_hot.gif
rename to styles/templates/default/images/folder_hot.gif
diff --git a/upload/styles/templates/default/images/folder_lock.gif b/styles/templates/default/images/folder_lock.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_lock.gif
rename to styles/templates/default/images/folder_lock.gif
diff --git a/upload/styles/templates/default/images/folder_lock_new.gif b/styles/templates/default/images/folder_lock_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_lock_new.gif
rename to styles/templates/default/images/folder_lock_new.gif
diff --git a/upload/styles/templates/default/images/folder_locked_big.gif b/styles/templates/default/images/folder_locked_big.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_locked_big.gif
rename to styles/templates/default/images/folder_locked_big.gif
diff --git a/upload/styles/templates/default/images/folder_new.gif b/styles/templates/default/images/folder_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_new.gif
rename to styles/templates/default/images/folder_new.gif
diff --git a/upload/styles/templates/default/images/folder_new_big.gif b/styles/templates/default/images/folder_new_big.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_new_big.gif
rename to styles/templates/default/images/folder_new_big.gif
diff --git a/upload/styles/templates/default/images/folder_new_hot.gif b/styles/templates/default/images/folder_new_hot.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_new_hot.gif
rename to styles/templates/default/images/folder_new_hot.gif
diff --git a/upload/styles/templates/default/images/folder_sticky.gif b/styles/templates/default/images/folder_sticky.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_sticky.gif
rename to styles/templates/default/images/folder_sticky.gif
diff --git a/upload/styles/templates/default/images/folder_sticky_new.gif b/styles/templates/default/images/folder_sticky_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/folder_sticky_new.gif
rename to styles/templates/default/images/folder_sticky_new.gif
diff --git a/upload/styles/templates/default/images/hr200_ltr_gradient.jpg b/styles/templates/default/images/hr200_ltr_gradient.jpg
similarity index 100%
rename from upload/styles/templates/default/images/hr200_ltr_gradient.jpg
rename to styles/templates/default/images/hr200_ltr_gradient.jpg
diff --git a/upload/styles/templates/default/images/hr400_ltr_gradient.jpg b/styles/templates/default/images/hr400_ltr_gradient.jpg
similarity index 100%
rename from upload/styles/templates/default/images/hr400_ltr_gradient.jpg
rename to styles/templates/default/images/hr400_ltr_gradient.jpg
diff --git a/upload/styles/templates/default/images/icon_birthday.gif b/styles/templates/default/images/icon_birthday.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_birthday.gif
rename to styles/templates/default/images/icon_birthday.gif
diff --git a/upload/styles/templates/default/images/icon_delete.gif b/styles/templates/default/images/icon_delete.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_delete.gif
rename to styles/templates/default/images/icon_delete.gif
diff --git a/upload/styles/templates/default/images/icon_female.gif b/styles/templates/default/images/icon_female.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_female.gif
rename to styles/templates/default/images/icon_female.gif
diff --git a/upload/styles/templates/default/images/icon_latest_reply.gif b/styles/templates/default/images/icon_latest_reply.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_latest_reply.gif
rename to styles/templates/default/images/icon_latest_reply.gif
diff --git a/upload/styles/templates/default/images/icon_male.gif b/styles/templates/default/images/icon_male.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_male.gif
rename to styles/templates/default/images/icon_male.gif
diff --git a/upload/styles/templates/default/images/icon_minipost.gif b/styles/templates/default/images/icon_minipost.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_minipost.gif
rename to styles/templates/default/images/icon_minipost.gif
diff --git a/upload/styles/templates/default/images/icon_minipost_new.gif b/styles/templates/default/images/icon_minipost_new.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_minipost_new.gif
rename to styles/templates/default/images/icon_minipost_new.gif
diff --git a/upload/styles/templates/default/images/icon_minus_1.gif b/styles/templates/default/images/icon_minus_1.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_minus_1.gif
rename to styles/templates/default/images/icon_minus_1.gif
diff --git a/upload/styles/templates/default/images/icon_minus_2.gif b/styles/templates/default/images/icon_minus_2.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_minus_2.gif
rename to styles/templates/default/images/icon_minus_2.gif
diff --git a/upload/styles/templates/default/images/icon_mod.gif b/styles/templates/default/images/icon_mod.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_mod.gif
rename to styles/templates/default/images/icon_mod.gif
diff --git a/upload/styles/templates/default/images/icon_newest_reply.gif b/styles/templates/default/images/icon_newest_reply.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_newest_reply.gif
rename to styles/templates/default/images/icon_newest_reply.gif
diff --git a/upload/styles/templates/default/images/icon_nogender.gif b/styles/templates/default/images/icon_nogender.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_nogender.gif
rename to styles/templates/default/images/icon_nogender.gif
diff --git a/upload/styles/templates/default/images/icon_plus_1.gif b/styles/templates/default/images/icon_plus_1.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_plus_1.gif
rename to styles/templates/default/images/icon_plus_1.gif
diff --git a/upload/styles/templates/default/images/icon_plus_2.gif b/styles/templates/default/images/icon_plus_2.gif
similarity index 100%
rename from upload/styles/templates/default/images/icon_plus_2.gif
rename to styles/templates/default/images/icon_plus_2.gif
diff --git a/upload/styles/templates/default/images/img_alert.gif b/styles/templates/default/images/img_alert.gif
similarity index 100%
rename from upload/styles/templates/default/images/img_alert.gif
rename to styles/templates/default/images/img_alert.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_edit.gif b/styles/templates/default/images/lang/en/icon_edit.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_edit.gif
rename to styles/templates/default/images/lang/en/icon_edit.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_email.gif b/styles/templates/default/images/lang/en/icon_email.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_email.gif
rename to styles/templates/default/images/lang/en/icon_email.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_icq_add.gif b/styles/templates/default/images/lang/en/icon_icq_add.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_icq_add.gif
rename to styles/templates/default/images/lang/en/icon_icq_add.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_ip.gif b/styles/templates/default/images/lang/en/icon_ip.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_ip.gif
rename to styles/templates/default/images/lang/en/icon_ip.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_mc.gif b/styles/templates/default/images/lang/en/icon_mc.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_mc.gif
rename to styles/templates/default/images/lang/en/icon_mc.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_pm.gif b/styles/templates/default/images/lang/en/icon_pm.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_pm.gif
rename to styles/templates/default/images/lang/en/icon_pm.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_poll.gif b/styles/templates/default/images/lang/en/icon_poll.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_poll.gif
rename to styles/templates/default/images/lang/en/icon_poll.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_profile.gif b/styles/templates/default/images/lang/en/icon_profile.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_profile.gif
rename to styles/templates/default/images/lang/en/icon_profile.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_quote.gif b/styles/templates/default/images/lang/en/icon_quote.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_quote.gif
rename to styles/templates/default/images/lang/en/icon_quote.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_search.gif b/styles/templates/default/images/lang/en/icon_search.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_search.gif
rename to styles/templates/default/images/lang/en/icon_search.gif
diff --git a/upload/styles/templates/default/images/lang/en/icon_www.gif b/styles/templates/default/images/lang/en/icon_www.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/icon_www.gif
rename to styles/templates/default/images/lang/en/icon_www.gif
diff --git a/upload/styles/templates/default/images/lang/en/msg_newpost.gif b/styles/templates/default/images/lang/en/msg_newpost.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/msg_newpost.gif
rename to styles/templates/default/images/lang/en/msg_newpost.gif
diff --git a/upload/styles/templates/default/images/lang/en/post.gif b/styles/templates/default/images/lang/en/post.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/post.gif
rename to styles/templates/default/images/lang/en/post.gif
diff --git a/upload/styles/templates/default/images/lang/en/release.gif b/styles/templates/default/images/lang/en/release.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/release.gif
rename to styles/templates/default/images/lang/en/release.gif
diff --git a/upload/styles/templates/default/images/lang/en/reply-locked.gif b/styles/templates/default/images/lang/en/reply-locked.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/reply-locked.gif
rename to styles/templates/default/images/lang/en/reply-locked.gif
diff --git a/upload/styles/templates/default/images/lang/en/reply.gif b/styles/templates/default/images/lang/en/reply.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/en/reply.gif
rename to styles/templates/default/images/lang/en/reply.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_edit.gif b/styles/templates/default/images/lang/ru/icon_edit.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_edit.gif
rename to styles/templates/default/images/lang/ru/icon_edit.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_email.gif b/styles/templates/default/images/lang/ru/icon_email.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_email.gif
rename to styles/templates/default/images/lang/ru/icon_email.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_icq_add.gif b/styles/templates/default/images/lang/ru/icon_icq_add.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_icq_add.gif
rename to styles/templates/default/images/lang/ru/icon_icq_add.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_ip.gif b/styles/templates/default/images/lang/ru/icon_ip.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_ip.gif
rename to styles/templates/default/images/lang/ru/icon_ip.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_mc.gif b/styles/templates/default/images/lang/ru/icon_mc.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_mc.gif
rename to styles/templates/default/images/lang/ru/icon_mc.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_pm.gif b/styles/templates/default/images/lang/ru/icon_pm.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_pm.gif
rename to styles/templates/default/images/lang/ru/icon_pm.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_poll.gif b/styles/templates/default/images/lang/ru/icon_poll.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_poll.gif
rename to styles/templates/default/images/lang/ru/icon_poll.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_profile.gif b/styles/templates/default/images/lang/ru/icon_profile.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_profile.gif
rename to styles/templates/default/images/lang/ru/icon_profile.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_quote.gif b/styles/templates/default/images/lang/ru/icon_quote.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_quote.gif
rename to styles/templates/default/images/lang/ru/icon_quote.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_search.gif b/styles/templates/default/images/lang/ru/icon_search.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_search.gif
rename to styles/templates/default/images/lang/ru/icon_search.gif
diff --git a/upload/styles/templates/default/images/lang/ru/icon_www.gif b/styles/templates/default/images/lang/ru/icon_www.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/icon_www.gif
rename to styles/templates/default/images/lang/ru/icon_www.gif
diff --git a/upload/styles/templates/default/images/lang/ru/msg_newpost.gif b/styles/templates/default/images/lang/ru/msg_newpost.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/msg_newpost.gif
rename to styles/templates/default/images/lang/ru/msg_newpost.gif
diff --git a/upload/styles/templates/default/images/lang/ru/post.gif b/styles/templates/default/images/lang/ru/post.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/post.gif
rename to styles/templates/default/images/lang/ru/post.gif
diff --git a/upload/styles/templates/default/images/lang/ru/release.gif b/styles/templates/default/images/lang/ru/release.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/release.gif
rename to styles/templates/default/images/lang/ru/release.gif
diff --git a/upload/styles/templates/default/images/lang/ru/reply-locked.gif b/styles/templates/default/images/lang/ru/reply-locked.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/reply-locked.gif
rename to styles/templates/default/images/lang/ru/reply-locked.gif
diff --git a/upload/styles/templates/default/images/lang/ru/reply.gif b/styles/templates/default/images/lang/ru/reply.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/ru/reply.gif
rename to styles/templates/default/images/lang/ru/reply.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_edit.gif b/styles/templates/default/images/lang/uk/icon_edit.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_edit.gif
rename to styles/templates/default/images/lang/uk/icon_edit.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_email.gif b/styles/templates/default/images/lang/uk/icon_email.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_email.gif
rename to styles/templates/default/images/lang/uk/icon_email.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_icq_add.gif b/styles/templates/default/images/lang/uk/icon_icq_add.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_icq_add.gif
rename to styles/templates/default/images/lang/uk/icon_icq_add.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_ip.gif b/styles/templates/default/images/lang/uk/icon_ip.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_ip.gif
rename to styles/templates/default/images/lang/uk/icon_ip.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_mc.gif b/styles/templates/default/images/lang/uk/icon_mc.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_mc.gif
rename to styles/templates/default/images/lang/uk/icon_mc.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_pm.gif b/styles/templates/default/images/lang/uk/icon_pm.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_pm.gif
rename to styles/templates/default/images/lang/uk/icon_pm.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_poll.gif b/styles/templates/default/images/lang/uk/icon_poll.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_poll.gif
rename to styles/templates/default/images/lang/uk/icon_poll.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_profile.gif b/styles/templates/default/images/lang/uk/icon_profile.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_profile.gif
rename to styles/templates/default/images/lang/uk/icon_profile.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_quote.gif b/styles/templates/default/images/lang/uk/icon_quote.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_quote.gif
rename to styles/templates/default/images/lang/uk/icon_quote.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_search.gif b/styles/templates/default/images/lang/uk/icon_search.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_search.gif
rename to styles/templates/default/images/lang/uk/icon_search.gif
diff --git a/upload/styles/templates/default/images/lang/uk/icon_www.gif b/styles/templates/default/images/lang/uk/icon_www.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/icon_www.gif
rename to styles/templates/default/images/lang/uk/icon_www.gif
diff --git a/upload/styles/templates/default/images/lang/uk/msg_newpost.gif b/styles/templates/default/images/lang/uk/msg_newpost.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/msg_newpost.gif
rename to styles/templates/default/images/lang/uk/msg_newpost.gif
diff --git a/upload/styles/templates/default/images/lang/uk/post.gif b/styles/templates/default/images/lang/uk/post.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/post.gif
rename to styles/templates/default/images/lang/uk/post.gif
diff --git a/upload/styles/templates/default/images/lang/uk/release.gif b/styles/templates/default/images/lang/uk/release.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/release.gif
rename to styles/templates/default/images/lang/uk/release.gif
diff --git a/upload/styles/templates/default/images/lang/uk/reply-locked.gif b/styles/templates/default/images/lang/uk/reply-locked.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/reply-locked.gif
rename to styles/templates/default/images/lang/uk/reply-locked.gif
diff --git a/upload/styles/templates/default/images/lang/uk/reply.gif b/styles/templates/default/images/lang/uk/reply.gif
similarity index 100%
rename from upload/styles/templates/default/images/lang/uk/reply.gif
rename to styles/templates/default/images/lang/uk/reply.gif
diff --git a/upload/styles/templates/default/images/link_help.cur b/styles/templates/default/images/link_help.cur
similarity index 100%
rename from upload/styles/templates/default/images/link_help.cur
rename to styles/templates/default/images/link_help.cur
diff --git a/upload/styles/templates/default/images/loading.gif b/styles/templates/default/images/loading.gif
similarity index 100%
rename from upload/styles/templates/default/images/loading.gif
rename to styles/templates/default/images/loading.gif
diff --git a/upload/styles/templates/default/images/loading_1.gif b/styles/templates/default/images/loading_1.gif
similarity index 100%
rename from upload/styles/templates/default/images/loading_1.gif
rename to styles/templates/default/images/loading_1.gif
diff --git a/upload/styles/templates/default/images/menu_open.gif b/styles/templates/default/images/menu_open.gif
similarity index 100%
rename from upload/styles/templates/default/images/menu_open.gif
rename to styles/templates/default/images/menu_open.gif
diff --git a/upload/styles/templates/default/images/menu_open_1.gif b/styles/templates/default/images/menu_open_1.gif
similarity index 100%
rename from upload/styles/templates/default/images/menu_open_1.gif
rename to styles/templates/default/images/menu_open_1.gif
diff --git a/upload/styles/templates/default/images/msg_inbox.gif b/styles/templates/default/images/msg_inbox.gif
similarity index 100%
rename from upload/styles/templates/default/images/msg_inbox.gif
rename to styles/templates/default/images/msg_inbox.gif
diff --git a/upload/styles/templates/default/images/msg_outbox.gif b/styles/templates/default/images/msg_outbox.gif
similarity index 100%
rename from upload/styles/templates/default/images/msg_outbox.gif
rename to styles/templates/default/images/msg_outbox.gif
diff --git a/upload/styles/templates/default/images/msg_savebox.gif b/styles/templates/default/images/msg_savebox.gif
similarity index 100%
rename from upload/styles/templates/default/images/msg_savebox.gif
rename to styles/templates/default/images/msg_savebox.gif
diff --git a/upload/styles/templates/default/images/msg_sentbox.gif b/styles/templates/default/images/msg_sentbox.gif
similarity index 100%
rename from upload/styles/templates/default/images/msg_sentbox.gif
rename to styles/templates/default/images/msg_sentbox.gif
diff --git a/upload/styles/templates/default/images/progress_bar.gif b/styles/templates/default/images/progress_bar.gif
similarity index 100%
rename from upload/styles/templates/default/images/progress_bar.gif
rename to styles/templates/default/images/progress_bar.gif
diff --git a/upload/styles/templates/default/images/progress_bar_full.gif b/styles/templates/default/images/progress_bar_full.gif
similarity index 100%
rename from upload/styles/templates/default/images/progress_bar_full.gif
rename to styles/templates/default/images/progress_bar_full.gif
diff --git a/upload/styles/templates/default/images/spacer.gif b/styles/templates/default/images/spacer.gif
similarity index 100%
rename from upload/styles/templates/default/images/spacer.gif
rename to styles/templates/default/images/spacer.gif
diff --git a/upload/styles/templates/default/images/tbl_sort_asc.gif b/styles/templates/default/images/tbl_sort_asc.gif
similarity index 100%
rename from upload/styles/templates/default/images/tbl_sort_asc.gif
rename to styles/templates/default/images/tbl_sort_asc.gif
diff --git a/upload/styles/templates/default/images/tbl_sort_bg.gif b/styles/templates/default/images/tbl_sort_bg.gif
similarity index 100%
rename from upload/styles/templates/default/images/tbl_sort_bg.gif
rename to styles/templates/default/images/tbl_sort_bg.gif
diff --git a/upload/styles/templates/default/images/tbl_sort_desc.gif b/styles/templates/default/images/tbl_sort_desc.gif
similarity index 100%
rename from upload/styles/templates/default/images/tbl_sort_desc.gif
rename to styles/templates/default/images/tbl_sort_desc.gif
diff --git a/upload/styles/templates/default/images/topic_delete.gif b/styles/templates/default/images/topic_delete.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_delete.gif
rename to styles/templates/default/images/topic_delete.gif
diff --git a/upload/styles/templates/default/images/topic_dl.gif b/styles/templates/default/images/topic_dl.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_dl.gif
rename to styles/templates/default/images/topic_dl.gif
diff --git a/upload/styles/templates/default/images/topic_lock.gif b/styles/templates/default/images/topic_lock.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_lock.gif
rename to styles/templates/default/images/topic_lock.gif
diff --git a/upload/styles/templates/default/images/topic_move.gif b/styles/templates/default/images/topic_move.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_move.gif
rename to styles/templates/default/images/topic_move.gif
diff --git a/upload/styles/templates/default/images/topic_normal.gif b/styles/templates/default/images/topic_normal.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_normal.gif
rename to styles/templates/default/images/topic_normal.gif
diff --git a/upload/styles/templates/default/images/topic_split.gif b/styles/templates/default/images/topic_split.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_split.gif
rename to styles/templates/default/images/topic_split.gif
diff --git a/upload/styles/templates/default/images/topic_unlock.gif b/styles/templates/default/images/topic_unlock.gif
similarity index 100%
rename from upload/styles/templates/default/images/topic_unlock.gif
rename to styles/templates/default/images/topic_unlock.gif
diff --git a/upload/styles/templates/default/images/treeview/treeview-default-line.gif b/styles/templates/default/images/treeview/treeview-default-line.gif
similarity index 100%
rename from upload/styles/templates/default/images/treeview/treeview-default-line.gif
rename to styles/templates/default/images/treeview/treeview-default-line.gif
diff --git a/upload/styles/templates/default/images/treeview/treeview-default.gif b/styles/templates/default/images/treeview/treeview-default.gif
similarity index 100%
rename from upload/styles/templates/default/images/treeview/treeview-default.gif
rename to styles/templates/default/images/treeview/treeview-default.gif
diff --git a/upload/styles/templates/default/images/vote_lcap.gif b/styles/templates/default/images/vote_lcap.gif
similarity index 100%
rename from upload/styles/templates/default/images/vote_lcap.gif
rename to styles/templates/default/images/vote_lcap.gif
diff --git a/upload/styles/templates/default/images/vote_rcap.gif b/styles/templates/default/images/vote_rcap.gif
similarity index 100%
rename from upload/styles/templates/default/images/vote_rcap.gif
rename to styles/templates/default/images/vote_rcap.gif
diff --git a/upload/styles/templates/default/images/voting_bar.gif b/styles/templates/default/images/voting_bar.gif
similarity index 100%
rename from upload/styles/templates/default/images/voting_bar.gif
rename to styles/templates/default/images/voting_bar.gif
diff --git a/upload/styles/templates/default/images/whosonline.gif b/styles/templates/default/images/whosonline.gif
similarity index 100%
rename from upload/styles/templates/default/images/whosonline.gif
rename to styles/templates/default/images/whosonline.gif
diff --git a/upload/styles/templates/default/index.tpl b/styles/templates/default/index.tpl
similarity index 100%
rename from upload/styles/templates/default/index.tpl
rename to styles/templates/default/index.tpl
diff --git a/upload/styles/templates/default/index_map.tpl b/styles/templates/default/index_map.tpl
similarity index 100%
rename from upload/styles/templates/default/index_map.tpl
rename to styles/templates/default/index_map.tpl
diff --git a/upload/styles/templates/default/login.tpl b/styles/templates/default/login.tpl
similarity index 100%
rename from upload/styles/templates/default/login.tpl
rename to styles/templates/default/login.tpl
diff --git a/upload/styles/templates/default/memberlist.tpl b/styles/templates/default/memberlist.tpl
similarity index 100%
rename from upload/styles/templates/default/memberlist.tpl
rename to styles/templates/default/memberlist.tpl
diff --git a/upload/styles/templates/default/modcp.tpl b/styles/templates/default/modcp.tpl
similarity index 100%
rename from upload/styles/templates/default/modcp.tpl
rename to styles/templates/default/modcp.tpl
diff --git a/upload/styles/templates/default/modcp_split.tpl b/styles/templates/default/modcp_split.tpl
similarity index 100%
rename from upload/styles/templates/default/modcp_split.tpl
rename to styles/templates/default/modcp_split.tpl
diff --git a/upload/styles/templates/default/page_footer.tpl b/styles/templates/default/page_footer.tpl
similarity index 100%
rename from upload/styles/templates/default/page_footer.tpl
rename to styles/templates/default/page_footer.tpl
diff --git a/upload/styles/templates/default/page_header.tpl b/styles/templates/default/page_header.tpl
similarity index 100%
rename from upload/styles/templates/default/page_header.tpl
rename to styles/templates/default/page_header.tpl
diff --git a/upload/styles/templates/default/posting.tpl b/styles/templates/default/posting.tpl
similarity index 100%
rename from upload/styles/templates/default/posting.tpl
rename to styles/templates/default/posting.tpl
diff --git a/upload/styles/templates/default/posting_attach.tpl b/styles/templates/default/posting_attach.tpl
similarity index 100%
rename from upload/styles/templates/default/posting_attach.tpl
rename to styles/templates/default/posting_attach.tpl
diff --git a/upload/styles/templates/default/posting_editor.tpl b/styles/templates/default/posting_editor.tpl
similarity index 100%
rename from upload/styles/templates/default/posting_editor.tpl
rename to styles/templates/default/posting_editor.tpl
diff --git a/upload/styles/templates/default/posting_smilies.tpl b/styles/templates/default/posting_smilies.tpl
similarity index 100%
rename from upload/styles/templates/default/posting_smilies.tpl
rename to styles/templates/default/posting_smilies.tpl
diff --git a/upload/styles/templates/default/privmsgs.tpl b/styles/templates/default/privmsgs.tpl
similarity index 100%
rename from upload/styles/templates/default/privmsgs.tpl
rename to styles/templates/default/privmsgs.tpl
diff --git a/upload/styles/templates/default/privmsgs_read.tpl b/styles/templates/default/privmsgs_read.tpl
similarity index 100%
rename from upload/styles/templates/default/privmsgs_read.tpl
rename to styles/templates/default/privmsgs_read.tpl
diff --git a/upload/styles/templates/default/search.tpl b/styles/templates/default/search.tpl
similarity index 100%
rename from upload/styles/templates/default/search.tpl
rename to styles/templates/default/search.tpl
diff --git a/upload/styles/templates/default/search_results.tpl b/styles/templates/default/search_results.tpl
similarity index 100%
rename from upload/styles/templates/default/search_results.tpl
rename to styles/templates/default/search_results.tpl
diff --git a/upload/styles/templates/default/terms.tpl b/styles/templates/default/terms.tpl
similarity index 100%
rename from upload/styles/templates/default/terms.tpl
rename to styles/templates/default/terms.tpl
diff --git a/upload/styles/templates/default/torhelp.tpl b/styles/templates/default/torhelp.tpl
similarity index 100%
rename from upload/styles/templates/default/torhelp.tpl
rename to styles/templates/default/torhelp.tpl
diff --git a/upload/styles/templates/default/tpl_config.php b/styles/templates/default/tpl_config.php
similarity index 100%
rename from upload/styles/templates/default/tpl_config.php
rename to styles/templates/default/tpl_config.php
diff --git a/upload/styles/templates/default/tracker.tpl b/styles/templates/default/tracker.tpl
similarity index 100%
rename from upload/styles/templates/default/tracker.tpl
rename to styles/templates/default/tracker.tpl
diff --git a/upload/styles/templates/default/usercp_bonus.tpl b/styles/templates/default/usercp_bonus.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_bonus.tpl
rename to styles/templates/default/usercp_bonus.tpl
diff --git a/upload/styles/templates/default/usercp_email.tpl b/styles/templates/default/usercp_email.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_email.tpl
rename to styles/templates/default/usercp_email.tpl
diff --git a/upload/styles/templates/default/usercp_register.tpl b/styles/templates/default/usercp_register.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_register.tpl
rename to styles/templates/default/usercp_register.tpl
diff --git a/upload/styles/templates/default/usercp_sendpasswd.tpl b/styles/templates/default/usercp_sendpasswd.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_sendpasswd.tpl
rename to styles/templates/default/usercp_sendpasswd.tpl
diff --git a/upload/styles/templates/default/usercp_topic_watch.tpl b/styles/templates/default/usercp_topic_watch.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_topic_watch.tpl
rename to styles/templates/default/usercp_topic_watch.tpl
diff --git a/upload/styles/templates/default/usercp_viewprofile.tpl b/styles/templates/default/usercp_viewprofile.tpl
similarity index 100%
rename from upload/styles/templates/default/usercp_viewprofile.tpl
rename to styles/templates/default/usercp_viewprofile.tpl
diff --git a/upload/styles/templates/default/viewforum.tpl b/styles/templates/default/viewforum.tpl
similarity index 100%
rename from upload/styles/templates/default/viewforum.tpl
rename to styles/templates/default/viewforum.tpl
diff --git a/upload/styles/templates/default/viewtopic.tpl b/styles/templates/default/viewtopic.tpl
similarity index 100%
rename from upload/styles/templates/default/viewtopic.tpl
rename to styles/templates/default/viewtopic.tpl
diff --git a/upload/styles/templates/default/viewtopic_attach.tpl b/styles/templates/default/viewtopic_attach.tpl
similarity index 100%
rename from upload/styles/templates/default/viewtopic_attach.tpl
rename to styles/templates/default/viewtopic_attach.tpl
diff --git a/upload/styles/templates/default/viewtopic_attach_guest.tpl b/styles/templates/default/viewtopic_attach_guest.tpl
similarity index 100%
rename from upload/styles/templates/default/viewtopic_attach_guest.tpl
rename to styles/templates/default/viewtopic_attach_guest.tpl
diff --git a/upload/styles/templates/default/viewtopic_poll.tpl b/styles/templates/default/viewtopic_poll.tpl
similarity index 100%
rename from upload/styles/templates/default/viewtopic_poll.tpl
rename to styles/templates/default/viewtopic_poll.tpl
diff --git a/upload/styles/templates/default/viewtopic_torrent.tpl b/styles/templates/default/viewtopic_torrent.tpl
similarity index 100%
rename from upload/styles/templates/default/viewtopic_torrent.tpl
rename to styles/templates/default/viewtopic_torrent.tpl
diff --git a/upload/styles/templates/posting_tpl.tpl b/styles/templates/posting_tpl.tpl
similarity index 100%
rename from upload/styles/templates/posting_tpl.tpl
rename to styles/templates/posting_tpl.tpl
diff --git a/upload/terms.php b/terms.php
similarity index 100%
rename from upload/terms.php
rename to terms.php
diff --git a/upload/tracker.php b/tracker.php
similarity index 100%
rename from upload/tracker.php
rename to tracker.php
diff --git a/upload/viewforum.php b/viewforum.php
similarity index 100%
rename from upload/viewforum.php
rename to viewforum.php
diff --git a/upload/viewtopic.php b/viewtopic.php
similarity index 100%
rename from upload/viewtopic.php
rename to viewtopic.php