diff --git a/conf/__init__.py b/conf/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/brokersettings.py.example b/conf/brokersettings.py.example
similarity index 100%
rename from brokersettings.py.example
rename to conf/brokersettings.py.example
diff --git a/dbsettings.py.example b/conf/dbsettings.py.example
similarity index 100%
rename from dbsettings.py.example
rename to conf/dbsettings.py.example
diff --git a/settings.py b/settings.py
index 1c76e67..401cc63 100755
--- a/settings.py
+++ b/settings.py
@@ -15,10 +15,10 @@ ADMINS = (
 MANAGERS = ADMINS
 
 # Import db settings from dbsettings.py
-from dbsettings import *
+from conf.dbsettings import *
 
 # Import the Broker settings
-from brokersettings import *
+from conf.brokersettings import *
 
 # Local time zone for this installation. Choices can be found here:
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
@@ -167,7 +167,7 @@ EVE_PROXY_KEEP_LOGS = 30
 
 # try and import local settings
 try:
-    from settingslocal import *
+    from conf.settingslocal import *
 except:
     pass