--- a/qmsk_www/settings/__init__.py	Sat Oct 04 13:41:39 2014 +0300
+++ b/qmsk_www/settings/__init__.py	Sat Oct 04 13:46:07 2014 +0300
@@ -8,10 +8,8 @@
     https://docs.djangoproject.com/en/1.7/ref/settings/
 """
 
-from qmsk_www.settings.database import *
-from qmsk_www.settings.localization import *
+from qmsk_www.settings.project import *
 from qmsk_www.settings.pages import *
-from qmsk_www.settings.site import *
 
 try:
     from qmsk_www.settings.production import *

--- a/qmsk_www/settings/database.py	Sat Oct 04 13:41:39 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,6 +0,0 @@
-## Database
-# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
-DATABASES = {
-
-}
-

--- a/qmsk_www/settings/development.py	Sat Oct 04 13:41:39 2014 +0300
+++ b/qmsk_www/settings/development.py	Sat Oct 04 13:46:07 2014 +0300
@@ -1,8 +1,5 @@
 # See https://docs.djangoproject.com/en/1.7/howto/deployment/checklist/
 
-# SECURITY WARNING: keep the secret key used in production secret!
-SECRET_KEY = '&e#@fir!k-*w(=0$@j&0guyv8qq*mh7_55j6w@2=hm0x9^ya-2'
-
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
@@ -10,6 +7,15 @@
 
 ALLOWED_HOSTS = []
 
+# SECURITY WARNING: keep the secret key used in production secret!
+SECRET_KEY = '&e#@fir!k-*w(=0$@j&0guyv8qq*mh7_55j6w@2=hm0x9^ya-2'
+
+## Database
+# https://docs.djangoproject.com/en/1.7/ref/settings/#databases
+DATABASES = {
+
+}
+
 ## Logging
 LOGGING = {
     'version': 1,

--- a/qmsk_www/settings/localization.py	Sat Oct 04 13:41:39 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-## Internationalization
-# https://docs.djangoproject.com/en/1.7/topics/i18n/
-
-LANGUAGE_CODE = 'en-us'
-
-TIME_ZONE = 'UTC'
-
-USE_I18N = True
-
-USE_L10N = True
-
-USE_TZ = True
-

--- a/qmsk_www/settings/pages.py	Sat Oct 04 13:41:39 2014 +0300
+++ b/qmsk_www/settings/pages.py	Sat Oct 04 13:46:07 2014 +0300
@@ -1,2 +1,4 @@
+## Settings for qmsk.pages
+
 QMSK_PAGES_DIR = './pages'
 QMSK_PAGES_SITE = "qmsk.net"

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/qmsk_www/settings/project.py	Sat Oct 04 13:46:07 2014 +0300
@@ -0,0 +1,50 @@
+## Settings for qmsk_www project
+
+# Application definition
+INSTALLED_APPS = (
+    'django.contrib.staticfiles',
+    
+    'qmsk.pages',
+)
+
+MIDDLEWARE_CLASSES = (
+
+)
+
+ROOT_URLCONF = 'qmsk_www.urls'
+
+WSGI_APPLICATION = 'qmsk_www.wsgi.application'
+
+## Internationalization
+# https://docs.djangoproject.com/en/1.7/topics/i18n/
+LANGUAGE_CODE = 'en-us'
+
+TIME_ZONE = 'UTC'
+
+USE_I18N = True
+
+USE_L10N = True
+
+USE_TZ = True
+
+## Static files (CSS, JavaScript, Images)
+# https://docs.djangoproject.com/en/1.7/howto/static-files/
+STATIC_URL = '/static/'
+
+STATICFILES_DIRS = (
+    # django project files
+    './qmsk_www/static',
+
+    # shared between django projects
+    './static',
+)
+
+## Site templates
+TEMPLATE_DIRS = (
+    # django project files
+    './qmsk_www/templates',
+
+    # shared between django projects
+    './templates',
+)
+

--- a/qmsk_www/settings/site.py	Sat Oct 04 13:41:39 2014 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-## Application definition
-INSTALLED_APPS = (
-    'django.contrib.staticfiles',
-    
-    'qmsk.pages',
-)
-
-MIDDLEWARE_CLASSES = (
-
-)
-
-ROOT_URLCONF = 'qmsk_www.urls'
-
-WSGI_APPLICATION = 'qmsk_www.wsgi.application'
-
-## Static files (CSS, JavaScript, Images)
-# https://docs.djangoproject.com/en/1.7/howto/static-files/
-STATIC_URL = '/static/'
-STATICFILES_DIRS = (
-    # django project files
-    './qmsk_www/static',
-
-    # shared between django projects
-    './static',
-)
-
-## Site templates
-TEMPLATE_DIRS = (
-    # django project files
-    './qmsk_www/templates',
-
-    # shared between django projects
-    './templates',
-)
-