23 files changed, 18 insertions, 18 deletions
diff --git a/central/trunk/activate.php b/central/trunk/activate.php
index 3237b70..61a0fca 100644
--- a/central/trunk/activate.php
+++ b/central/trunk/activate.php

@@ -2,8 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
-include('template.php');
+include('includes/template.php');
 if (!isset($_GET['submit']))
 {
diff --git a/central/trunk/class.phpmailer.php b/central/trunk/includes/class.phpmailer.php
index 51a50e7..51a50e7 100644
--- a/central/trunk/class.phpmailer.php
+++ b/central/trunk/includes/class.phpmailer.php

diff --git a/central/trunk/class.smtp.php b/central/trunk/includes/class.smtp.php
index f1c9cfe..f1c9cfe 100644
--- a/central/trunk/class.smtp.php
+++ b/central/trunk/includes/class.smtp.php

diff --git a/central/trunk/db.php b/central/trunk/includes/db.php
index 168d303..b9f275b 100644
--- a/central/trunk/db.php
+++ b/central/trunk/includes/db.php

@@ -20,7 +20,7 @@ if (file_exists('install.php'))
 session_start();
-include('config.php');
+include('includes/config.php');
 mysql_connect($dbhost, $dbuser, $dbpass);
 mysql_select_db($dbname);
diff --git a/central/trunk/instadisc.php b/central/trunk/includes/instadisc.php
index 1867757..96f4940 100644
--- a/central/trunk/instadisc.php
+++ b/central/trunk/includes/instadisc.php

@@ -2,8 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include_once('db.php');
+include_once('includes/db.php');
-include_once('class.phpmailer.php');
+include_once('includes/class.phpmailer.php');
 function instaDisc_checkVerification($username, $verification, $verificationID, $table, $nameField, $passField)
 {
diff --git a/central/trunk/template.php b/central/trunk/includes/template.php
index b4ec16b..b4ec16b 100644
--- a/central/trunk/template.php
+++ b/central/trunk/includes/template.php

diff --git a/central/trunk/xmlrpc/array_key_exists.php b/central/trunk/includes/xmlrpc/array_key_exists.php
index c5ae519..c5ae519 100644
--- a/central/trunk/xmlrpc/array_key_exists.php
+++ b/central/trunk/includes/xmlrpc/array_key_exists.php

diff --git a/central/trunk/xmlrpc/is_a.php b/central/trunk/includes/xmlrpc/is_a.php
index d98db1f..d98db1f 100644
--- a/central/trunk/xmlrpc/is_a.php
+++ b/central/trunk/includes/xmlrpc/is_a.php

diff --git a/central/trunk/xmlrpc/is_callable.php b/central/trunk/includes/xmlrpc/is_callable.php
index b769c41..b769c41 100644
--- a/central/trunk/xmlrpc/is_callable.php
+++ b/central/trunk/includes/xmlrpc/is_callable.php

diff --git a/central/trunk/xmlrpc/is_scalar.php b/central/trunk/includes/xmlrpc/is_scalar.php
index c8f2bfc..c8f2bfc 100644
--- a/central/trunk/xmlrpc/is_scalar.php
+++ b/central/trunk/includes/xmlrpc/is_scalar.php

diff --git a/central/trunk/xmlrpc/var_export.php b/central/trunk/includes/xmlrpc/var_export.php
index 3a5ac3f..3a5ac3f 100644
--- a/central/trunk/xmlrpc/var_export.php
+++ b/central/trunk/includes/xmlrpc/var_export.php

diff --git a/central/trunk/xmlrpc/version_compare.php b/central/trunk/includes/xmlrpc/version_compare.php
index fc3abac..fc3abac 100644
--- a/central/trunk/xmlrpc/version_compare.php
+++ b/central/trunk/includes/xmlrpc/version_compare.php

diff --git a/central/trunk/xmlrpc/xmlrpc.inc b/central/trunk/includes/xmlrpc/xmlrpc.inc
index 06c6e44..06c6e44 100644
--- a/central/trunk/xmlrpc/xmlrpc.inc
+++ b/central/trunk/includes/xmlrpc/xmlrpc.inc

diff --git a/central/trunk/xmlrpc/xmlrpc_wrappers.inc b/central/trunk/includes/xmlrpc/xmlrpc_wrappers.inc
index cd0a56f..cd0a56f 100644
--- a/central/trunk/xmlrpc/xmlrpc_wrappers.inc
+++ b/central/trunk/includes/xmlrpc/xmlrpc_wrappers.inc

diff --git a/central/trunk/xmlrpc/xmlrpcs.inc b/central/trunk/includes/xmlrpc/xmlrpcs.inc
index 9588919..9588919 100644
--- a/central/trunk/xmlrpc/xmlrpcs.inc
+++ b/central/trunk/includes/xmlrpc/xmlrpcs.inc

diff --git a/central/trunk/index.php b/central/trunk/index.php
index 1ef9c9d..703cab8 100644
--- a/central/trunk/index.php
+++ b/central/trunk/index.php

@@ -2,8 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
-include('template.php');
+include('includes/template.php');
 $template = new FITemplate('index');
 $template->add('SITENAME', instaDisc_getConfig('siteName'));
diff --git a/central/trunk/install.php b/central/trunk/install.php
index f41713f..b819e84 100644
--- a/central/trunk/install.php
+++ b/central/trunk/install.php

@@ -2,7 +2,7 @@
 /* InstaDisc Server - A Four Island Project */
-include('class.phpmailer.php');
+include('includes/class.phpmailer.php');
 $softwareVersion = 1;
diff --git a/central/trunk/login.php b/central/trunk/login.php
index cb96356..041376a 100644
--- a/central/trunk/login.php
+++ b/central/trunk/login.php

@@ -2,8 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
-include('template.php');
+include('includes/template.php');
 if (!isset($_GET['submit']))
 {
diff --git a/central/trunk/register.php b/central/trunk/register.php
index 87774fc..fd09fde 100644
--- a/central/trunk/register.php
+++ b/central/trunk/register.php

@@ -2,7 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
+include('includes/template.php');
 if (!isset($_GET['submit']))
 {
diff --git a/central/trunk/subscription.php b/central/trunk/subscription.php
index 020f7d7..9b6a61c 100644
--- a/central/trunk/subscription.php
+++ b/central/trunk/subscription.php

@@ -2,7 +2,7 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
 ?>Subscription: http://fourisland.com/<?php echo($_SERVER['SERVER_NAME'] . "\n"); ?>
 Title: <?php echo(instaDisc_getConfig('siteName') . "\n"); ?>
diff --git a/central/trunk/uniform.css b/central/trunk/theme/uniform.css
index ae810cb..ae810cb 100644
--- a/central/trunk/uniform.css
+++ b/central/trunk/theme/uniform.css

diff --git a/central/trunk/userpanel.php b/central/trunk/userpanel.php
index 879a75c..f28b8fb 100644
--- a/central/trunk/userpanel.php
+++ b/central/trunk/userpanel.php

@@ -2,8 +2,8 @@
 /* InstaDisc Server - A Four Island Project */
-include('instadisc.php');
+include('includes/instadisc.php');
-include('template.php');
+include('includes/template.php');
 if (isset($_SESSION['username']))
 {
diff --git a/central/trunk/xmlrpc.php b/central/trunk/xmlrpc.php
index 37c3216..88fff7f 100644
--- a/central/trunk/xmlrpc.php
+++ b/central/trunk/xmlrpc.php

@@ -2,10 +2,9 @@
 /* InstaDisc Server - A Four Island Project */
-include('xmlrpc/xmlrpc.inc');
+include('includes/xmlrpc/xmlrpc.inc');
-include('xmlrpc/xmlrpcs.inc');
+include('includes/xmlrpc/xmlrpcs.inc');
-include('db.php');
+include('includes/instadisc.php');
-include('instadisc.php');
 function checkRegistration($username, $verification, $verificationID)
 {