diff --git a/application/configs/conf.php b/application/configs/conf.php
index b4c3a9160..41f5aea4c 100644
--- a/application/configs/conf.php
+++ b/application/configs/conf.php
@@ -1,12 +1,4 @@
 <?php
-define('AIRTIME_VERSION', '1.7.0-alpha');
-define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
-define('AIRTIME_REST_VERSION', '1.1');
-
-// These are the default values for the config.
-global $CC_CONFIG;
-$values = load_airtime_config();
-
 // **********************************
 // ***** START CUSTOMIZING HERE *****
 // **********************************
@@ -16,37 +8,45 @@ $values = load_airtime_config();
 // For example:
 // $baseFilesDir = '/home/john/radio-files';
 $baseFilesDir = __DIR__.'/../../files';
+// ***********************************************************************
+// STOP CUSTOMIZING HERE
+//
+// You don't need to touch anything below this point.
+// ***********************************************************************
+
+define('AIRTIME_VERSION', '1.7.0-alpha');
+define('AIRTIME_COPYRIGHT_DATE', '2010-2011');
+define('AIRTIME_REST_VERSION', '1.1');
+
+// These are the default values for the config.
+global $CC_CONFIG;
+$values = load_airtime_config();
 
 $CC_CONFIG = array(
 
     // Name of the web server user
-    'webServerUser' => 'www-data',
+    'webServerUser' => $values['general']['webServerUser'],
 
-    'rabbitmq' => array("host" => "127.0.0.1",
-                        "port" => "5672",
-                        "user" => "guest",
-                        "password" => "guest",
-                        "vhost" => "/"),
-
-    // ***********************************************************************
-	// STOP CUSTOMIZING HERE
-	//
-	// You don't need to touch anything below this point.
-	// ***********************************************************************
+    'rabbitmq' => $values['rabbitmq'],
 
     'baseFilesDir' => $baseFilesDir,
     // main directory for storing binary media files
     'storageDir'    =>  "$baseFilesDir/stor",
 
 	// Database config
-    'dsn' => $values['database'],
+    'dsn' => array(
+                'username'      => $values['database']['dbuser'],
+                'password'      => $values['database']['dbpass'],
+                'hostspec'      => $values['database']['host'],
+                'phptype'       => 'pgsql',
+                'database'      => $values['database']['dbname']),
 
     // prefix for table names in the database
     'tblNamePrefix' => 'cc_',
 
     /* ================================================ storage configuration */
 
-    'apiKey' => $values['api_key'],
+    'apiKey' => array($values['general']['api_key']),
     'apiPath' => '/api/',
 
     'soundcloud-client-id' => '2CLCxcSXYzx7QhhPVHN4A',
@@ -90,8 +90,9 @@ set_include_path('.'.PATH_SEPARATOR.$CC_CONFIG['pearPath']
 					.PATH_SEPARATOR.$old_include_path);
 
 function load_airtime_config(){
-	$ini_array = parse_ini_file(dirname(__FILE__).'/../../build/airtime.conf', true);
-
+	$ini_array = parse_ini_file('/etc/airtime/airtime.conf', true);
+    return $ini_array;
+    /*
 	return array(
             'database' => array(
                 'username'      => $ini_array['database']['dbuser'],
@@ -101,4 +102,5 @@ function load_airtime_config(){
                 'database'      => $ini_array['database']['dbname']),
             'api_key' => array($ini_array['general']['api_key'])
         );
+        */
 }
diff --git a/build/airtime.conf b/build/airtime.conf
index e72855457..97c9e8147 100644
--- a/build/airtime.conf
+++ b/build/airtime.conf
@@ -4,6 +4,13 @@ dbname = airtime
 dbuser = airtime
 dbpass = airtime
 
+[rabbitmq]
+host = 127.0.0.1
+port = 5672
+user = guest
+password = guest
+vhost = /
+
 [general]
 api_key = AAA
-
+webServerUser = www-data
diff --git a/install/airtime-install.php b/install/airtime-install.php
index a0428878c..0fa541db3 100644
--- a/install/airtime-install.php
+++ b/install/airtime-install.php
@@ -5,21 +5,16 @@
  * @license http://www.gnu.org/licenses/gpl.txt
  */
 
-// Do not allow remote execution
-$arr = array_diff_assoc($_SERVER, $_ENV);
-if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
-    header("HTTP/1.1 400");
-    header("Content-type: text/plain; charset=UTF-8");
-    echo "400 Not executable\r\n";
-    exit(1);
-}
-
-require_once(dirname(__FILE__).'/../application/configs/conf.php');
-require_once(dirname(__FILE__).'/installInit.php');
-
 echo "******************************** Install Begin *********************************".PHP_EOL;
 
-AirtimeInstall::ExitIfNotRoot();
+require_once(dirname(__FILE__).'/include/installInit.php');
+
+ExitIfNotRoot();
+CreateINIFile();
+
+require_once(dirname(__FILE__).'/../application/configs/conf.php');
+require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
+
 AirtimeInstall::CreateApiKey();
 AirtimeInstall::UpdateIniValue('../build/build.properties', 'project.home', realpath(__dir__.'/../'));
 
diff --git a/install/airtime-uninstall.php b/install/airtime-uninstall.php
index 5b9a58c3a..b82a79f07 100644
--- a/install/airtime-uninstall.php
+++ b/install/airtime-uninstall.php
@@ -5,20 +5,13 @@
  * @license http://www.gnu.org/licenses/gpl.txt
  */
 
-// Do not allow remote execution.
-$arr = array_diff_assoc($_SERVER, $_ENV);
-if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
-    header("HTTP/1.1 400");
-    header("Content-type: text/plain; charset=UTF-8");
-    echo "400 Not executable".PHP_EOL;
-    exit;
-}
+require_once(dirname(__FILE__).'/include/installInit.php');
+// Need to check that we are superuser before running this.
+ExitIfNotRoot();
 
 require_once(dirname(__FILE__).'/../application/configs/conf.php');
-require_once(dirname(__FILE__).'/installInit.php');
+require_once(dirname(__FILE__).'/include/AirtimeInstall.php');
 
-// Need to check that we are superuser before running this.
-AirtimeInstall::ExitIfNotRoot();
 
 AirtimeInstall::RemoveSymlinks();
 
@@ -80,7 +73,7 @@ if ($results == 0) {
 // Delete files
 //------------------------------------------------------------------------
 AirtimeInstall::DeleteFilesRecursive($CC_CONFIG['storageDir']);
-
+RemoveINIFile();
 
 $command = "python ".__DIR__."/../python_apps/pypo/install/pypo-uninstall.py";
 system($command);
diff --git a/install/installInit.php b/install/include/AirtimeInstall.php
similarity index 85%
rename from install/installInit.php
rename to install/include/AirtimeInstall.php
index d720daaab..5286e10fc 100644
--- a/install/installInit.php
+++ b/install/include/AirtimeInstall.php
@@ -1,11 +1,7 @@
 <?php
-if (!function_exists('pg_connect')) {
-    trigger_error("PostgreSQL PHP extension required and not found.", E_USER_ERROR);
-    exit(2);
-}
 
-require_once(dirname(__FILE__).'/../library/pear/DB.php');
-require_once(dirname(__FILE__).'/../application/configs/conf.php');
+require_once(dirname(__FILE__).'/../../library/pear/DB.php');
+require_once(dirname(__FILE__).'/../../application/configs/conf.php');
 
 class AirtimeInstall {
 
@@ -78,18 +74,9 @@ class AirtimeInstall {
     public static function CreateApiKey()
     {
         $api_key = AirtimeInstall::GenerateRandomString();
-        AirtimeInstall::UpdateIniValue(__DIR__.'/../build/airtime.conf', 'api_key', $api_key);
-        AirtimeInstall::UpdateIniValue(__DIR__.'/../python_apps/pypo/config.cfg', 'api_key', "'$api_key'");
-        AirtimeInstall::UpdateIniValue(__DIR__.'/../python_apps/show-recorder/config.cfg', 'api_key', "'$api_key'");
-    }
-
-    public static function ExitIfNotRoot()
-    {
-        // Need to check that we are superuser before running this.
-        if(exec("whoami") != "root"){
-            echo "Must be root user.\n";
-            exit(1);
-        }
+        AirtimeInstall::UpdateIniValue('/etc/airtime/airtime.conf', 'api_key', $api_key);
+        AirtimeInstall::UpdateIniValue('/etc/airtime/pypo.cfg', 'api_key', "'$api_key'");
+        AirtimeInstall::UpdateIniValue('/etc/airtime/recorder.cfg', 'api_key', "'$api_key'");
     }
 
     public static function UpdateIniValue($filename, $property, $value)
@@ -181,7 +168,7 @@ class AirtimeInstall {
     public static function CreateDatabaseTables()
     {
         // Put Propel sql files in Database
-        $command = __DIR__."/../library/propel/generator/bin/propel-gen ../build/ insert-sql 2>propel-error.log";
+        $command = __DIR__."/../../library/propel/generator/bin/propel-gen ../build/ insert-sql 2>propel-error.log";
         @exec($command, $output, $results);
     }
 
@@ -200,10 +187,10 @@ class AirtimeInstall {
     public static function CreateSymlinks(){
         AirtimeInstall::RemoveSymlinks();
 
-        $dir = realpath(__DIR__."/../utils/airtime-import");
+        $dir = realpath(__DIR__."/../../utils/airtime-import");
         exec("ln -s $dir /usr/bin/airtime-import");
 
-        $dir = realpath(__DIR__."/../utils/airtime-clean-storage");
+        $dir = realpath(__DIR__."/../../utils/airtime-clean-storage");
         exec("ln -s $dir /usr/bin/airtime-clean-storage");
     }
 
@@ -211,6 +198,4 @@ class AirtimeInstall {
         exec("rm -f /usr/bin/airtime-import");
         exec("rm -f /usr/bin/airtime-clean-storage");
     }
-
-
 }
diff --git a/install/include/installInit.php b/install/include/installInit.php
new file mode 100644
index 000000000..99793c0ff
--- /dev/null
+++ b/install/include/installInit.php
@@ -0,0 +1,56 @@
+<?php
+
+// Do not allow remote execution
+$arr = array_diff_assoc($_SERVER, $_ENV);
+if (isset($arr["DOCUMENT_ROOT"]) && ($arr["DOCUMENT_ROOT"] != "") ) {
+    header("HTTP/1.1 400");
+    header("Content-type: text/plain; charset=UTF-8");
+    echo "400 Not executable\r\n";
+    exit(1);
+}
+
+if (!function_exists('pg_connect')) {
+    trigger_error("PostgreSQL PHP extension required and not found.", E_USER_ERROR);
+    exit(2);
+}
+
+function CreateINIFile(){
+    if (!file_exists("/etc/airtime/")){
+        if (!mkdir("/etc/airtime/", 0755, true)){
+            echo "Could not create /etc/airtime/ directory. Exiting.";
+            exit(1);
+        }
+    }
+    
+    if (!copy(__DIR__."/../../build/airtime.conf", "/etc/airtime/airtime.conf")){
+        echo "Could not copy airtime.conf to /etc/airtime/. Exiting.";
+        exit(1);
+    }
+    if (!copy(__DIR__."/../../python_apps/pypo/pypo.cfg", "/etc/airtime/pypo.cfg")){
+        echo "Could not copy pypo.cfg to /etc/airtime/. Exiting.";
+        exit(1);
+    }
+    if (!copy(__DIR__."/../../python_apps/show-recorder/recorder.cfg", "/etc/airtime/recorder.cfg")){
+        echo "Could not copy recorder.cfg to /etc/airtime/. Exiting.";
+        exit(1);
+    }
+}
+
+function RemoveINIFile(){
+    if (file_exists("/etc/airtime/airtime.conf")){
+        unlink("/etc/airtime/airtime.conf");
+    }
+
+    if (file_exists("etc/airtime")){
+        rmdir("/etc/airtime/");
+    }
+}
+
+function ExitIfNotRoot()
+{
+    // Need to check that we are superuser before running this.
+    if(exec("whoami") != "root"){
+        echo "Must be root user.\n";
+        exit(1);
+    }
+}
diff --git a/python_apps/api_clients/api_client.py b/python_apps/api_clients/api_client.py
index 4de68443c..83090d3b6 100644
--- a/python_apps/api_clients/api_client.py
+++ b/python_apps/api_clients/api_client.py
@@ -117,7 +117,7 @@ class AirTimeApiClient(ApiClientInterface):
 
     def __get_airtime_version(self, verbose = True):
         logger = logging.getLogger()
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["version_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["version_url"])
         logger.debug("Trying to contact %s", url)
         url = url.replace("%%api_key%%", self.config["api_key"])
 
@@ -199,7 +199,7 @@ class AirTimeApiClient(ApiClientInterface):
                 
         # Construct the URL
         #export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
-        export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["export_url"])
+        export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["export_url"])
         
         logger.info("Fetching schedule from %s", export_url)
         export_url = export_url.replace('%%api_key%%', self.config["api_key"])
@@ -239,7 +239,7 @@ class AirTimeApiClient(ApiClientInterface):
         playlist = schedule[pkey]
         schedule_id = playlist["schedule_id"]       
         #url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["update_item_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_item_url"])
         
         url = url.replace("%%schedule_id%%", str(schedule_id))
         logger.debug(url)
@@ -268,7 +268,7 @@ class AirTimeApiClient(ApiClientInterface):
         try:
             schedule_id = data
             #url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
-            url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["update_start_playing_url"])
+            url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_start_playing_url"])
             url = url.replace("%%media_id%%", str(media_id))
             url = url.replace("%%schedule_id%%", str(schedule_id))
             logger.debug(url)
@@ -297,7 +297,7 @@ class AirTimeApiClient(ApiClientInterface):
         logger = logging.getLogger()
         response = ''
         try:
-            url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["show_schedule_url"])
+            url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["show_schedule_url"])
             #url = self.config["base_url"] + self.config["api_base"] + self.config["show_schedule_url"]
             logger.debug(url)
             url = url.replace("%%api_key%%", self.config["api_key"])
@@ -316,7 +316,7 @@ class AirTimeApiClient(ApiClientInterface):
         response = ''
         try:
             #url = self.config["base_url"] + self.config["api_base"] + self.config["upload_file_url"]
-            url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["upload_file_url"])
+            url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["upload_file_url"])
 
             logger.debug(url)
             url = url.replace("%%api_key%%", self.config["api_key"])
@@ -379,7 +379,7 @@ class ObpApiClient():
 
         # lookup OBP version        
         #url = self.config["base_url"] + self.config["api_base"]+ self.config["version_url"]
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["version_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["version_url"])
         
         
         try:    
@@ -440,7 +440,7 @@ class ObpApiClient():
         
         # Construct the URL
         #export_url = self.config["base_url"] + self.config["api_base"] + self.config["export_url"]
-        export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["export_url"])
+        export_url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["export_url"])
         
         # Insert the start and end times into the URL        
         export_url = export_url.replace('%%api_key%%', self.config["api_key"])
@@ -479,7 +479,7 @@ class ObpApiClient():
     #def update_scheduled_item(self, item_id, value):
         logger = logging.getLogger()
         #url = self.config["base_url"] + self.config["api_base"] + self.config["update_item_url"]
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["update_item_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_item_url"])
         url = url.replace("%%item_id%%", str(schedule[pkey]["id"]))
         url = url.replace("%%played%%", "1")
         
@@ -510,7 +510,7 @@ class ObpApiClient():
         transmission_id = data["transmission_id"]
         
         #url = self.config["base_url"] + self.config["api_base"] + self.config["update_start_playing_url"]
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["update_start_playing_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["update_start_playing_url"])
         url = url.replace("%%playlist_type%%", str(playlist_type))
         url = url.replace("%%export_source%%", str(export_source))
         url = url.replace("%%media_id%%", str(media_id))
@@ -537,7 +537,7 @@ class ObpApiClient():
         logger = logging.getLogger()
     
         #url = self.config["base_url"] + self.config["api_base"] + self.config["generate_range_url"]
-        url = "http://%s:%s/%s/%s" % (self.config["base_url"], self.config["base_port"], self.config["api_base"], self.config["generate_range_url"])
+        url = "http://%s:%s/%s/%s" % (self.config["base_url"], str(self.config["base_port"]), self.config["api_base"], self.config["generate_range_url"])
         
         try:
             response = urllib.urlopen(url, self.api_auth)
diff --git a/python_apps/pypo/pypo-api-validator.py b/python_apps/pypo/pypo-api-validator.py
index f5c85e317..0fcce4fef 100755
--- a/python_apps/pypo/pypo-api-validator.py
+++ b/python_apps/pypo/pypo-api-validator.py
@@ -31,7 +31,7 @@ import unittest
 logging.config.fileConfig("logging-api-validator.cfg")
 
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/pypo.cfg')
 except Exception, e:
     print 'Error loading config file: ', e
     sys.exit()
diff --git a/python_apps/pypo/pypo-cli.py b/python_apps/pypo/pypo-cli.py
index 208049d7b..87b24b8b4 100755
--- a/python_apps/pypo/pypo-cli.py
+++ b/python_apps/pypo/pypo-cli.py
@@ -63,7 +63,7 @@ logging.config.fileConfig("logging.cfg")
 
 # loading config file
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/pypo.cfg')
 except Exception, e:
     print 'Error loading config file: ', e
     sys.exit()
diff --git a/python_apps/pypo/pypo-notify.py b/python_apps/pypo/pypo-notify.py
index 5e46e088f..d59932dcb 100755
--- a/python_apps/pypo/pypo-notify.py
+++ b/python_apps/pypo/pypo-notify.py
@@ -58,7 +58,7 @@ logging.config.fileConfig("logging.cfg")
 
 # loading config file
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/pypo.cfg')
     
 except Exception, e:
     print 'error: ', e
diff --git a/python_apps/pypo/config.cfg b/python_apps/pypo/pypo.cfg
similarity index 99%
rename from python_apps/pypo/config.cfg
rename to python_apps/pypo/pypo.cfg
index b1f9ed229..2b4accb34 100644
--- a/python_apps/pypo/config.cfg
+++ b/python_apps/pypo/pypo.cfg
@@ -75,7 +75,7 @@ cue_style = 'pre'
 # Airtime Config #
 #####################
 # Value needed to access the API
-api_key = 'AAA'
+api_key = 'OTBGMVOAWNJZEK7AEWSM'
 
 # Path to the base of the API
 api_base = 'api'
diff --git a/python_apps/pypo/pypofetch.py b/python_apps/pypo/pypofetch.py
index bd09ff2ee..4c4d438a1 100644
--- a/python_apps/pypo/pypofetch.py
+++ b/python_apps/pypo/pypofetch.py
@@ -27,7 +27,7 @@ logging.config.fileConfig("logging.cfg")
 
 # loading config file
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/pypo.cfg')
     LS_HOST = config['ls_host']
     LS_PORT = config['ls_port']
     POLL_INTERVAL = int(config['poll_interval'])
diff --git a/python_apps/pypo/pypopush.py b/python_apps/pypo/pypopush.py
index 25bfddbf1..db3d95393 100644
--- a/python_apps/pypo/pypopush.py
+++ b/python_apps/pypo/pypopush.py
@@ -20,7 +20,7 @@ logging.config.fileConfig("logging.cfg")
 
 # loading config file
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/pypo.cfg')
     LS_HOST = config['ls_host']
     LS_PORT = config['ls_port']
     PUSH_INTERVAL = 2
diff --git a/python_apps/show-recorder/config.cfg b/python_apps/show-recorder/recorder.cfg
similarity index 94%
rename from python_apps/show-recorder/config.cfg
rename to python_apps/show-recorder/recorder.cfg
index 7b64b047c..4c79f69de 100644
--- a/python_apps/show-recorder/config.cfg
+++ b/python_apps/show-recorder/recorder.cfg
@@ -7,7 +7,7 @@ base_url = 'localhost'
 base_recorded_files = '/home/pypo/Music/'
 
 # Value needed to access the API
-api_key = 'AAA'
+api_key = 'OTBGMVOAWNJZEK7AEWSM'
 
 # Path to the base of the API
 api_base = 'api'
diff --git a/python_apps/show-recorder/testrecordscript.py b/python_apps/show-recorder/testrecordscript.py
index a352e1f26..723b7f52f 100644
--- a/python_apps/show-recorder/testrecordscript.py
+++ b/python_apps/show-recorder/testrecordscript.py
@@ -32,7 +32,7 @@ except Exception, e:
 
 # loading config file
 try:
-    config = ConfigObj('config.cfg')
+    config = ConfigObj('/etc/airtime/recorder.cfg')
 except Exception, e:
     print 'Error loading config file: ', e
     sys.exit()