diff --git a/planetstack/hpc_wizard/bigquery_config.py b/planetstack/hpc_wizard/bigquery_config.py
index 0ed1f80..ffe3e7f 100644
--- a/planetstack/hpc_wizard/bigquery_config.py
+++ b/planetstack/hpc_wizard/bigquery_config.py
@@ -1,3 +1,3 @@
 BIGQUERY_DIR = "/opt/planetstack"
-BIGQUERY_SECRETS_FN = os.path.join(BIGQUERY_DIR, "client_secrets.json")
-BIGQUERY_CREDENTIALS_FN = os.path.join(BIGQUERY_DIR, "bigquery_credentials.dat")
+BIGQUERY_SECRETS_FN = os.path.join(BIGQUERY_DIR, "hpc_wizard/client_secrets.json")
+BIGQUERY_CREDENTIALS_FN = os.path.join(BIGQUERY_DIR, "hpc_wizard/bigquery_credentials.dat")
diff --git a/planetstack/planetstack/settings.py b/planetstack/planetstack/settings.py
index 19bf9e8..809ff63 100644
--- a/planetstack/planetstack/settings.py
+++ b/planetstack/planetstack/settings.py
@@ -6,6 +6,7 @@
 config = Config()
 
 GEOIP_PATH = "/usr/share/GeoIP"
+XOS_DIR = "/opt/xos"
  
 DEBUG = True
 TEMPLATE_DEBUG = DEBUG
@@ -80,11 +81,8 @@
 STATIC_URL = '/static/'
 
 # Additional locations of static files
-STATICFILES_DIRS = ( "/opt/planetstack/core/static/",
-                     "/opt/planetstack/core/xoslib/static/",
-    # Put strings here, like "/home/html/static" or "C:/www/django/static".
-    # Always use forward slashes, even on Windows.
-    # Don't forget to use absolute paths, not relative paths.
+STATICFILES_DIRS = ( XOS_DIR + "/core/static/",
+                     XOS_DIR + "/core/xoslib/static/",
 )
 
 # List of finder classes that know how to find static files in
@@ -125,8 +123,8 @@
     # Put strings here, like "/home/html/django_templates" or "C:/www/django/templates".
     # Always use forward slashes, even on Windows.
     # Don't forget to use absolute paths, not relative paths.
-    "/opt/planetstack/templates",
-    "/opt/planetstack/core/xoslib/templates",    
+    XOS_DIR + "/templates",
+    XOS_DIR + "/core/xoslib/templates",    
 )
 
 INSTALLED_APPS = (
@@ -261,7 +259,7 @@
 BIGQUERY_TABLE = getattr(config, "bigquery_table", "demoevents")
 
 DISABLE_MINIDASHBOARD = getattr(config, "gui_disable_minidashboard", False)
-ENCRYPTED_FIELDS_KEYDIR = '/opt/planetstack/private_keys'
+ENCRYPTED_FIELDS_KEYDIR = XOS_DIR + "/private_keys'
 ENCRYPTED_FIELD_MODE = 'ENCRYPT'
 
 STATISTICS_DRIVER = getattr(config, "statistics_driver", "ceilometer")