diff --git a/main/interfaces/Default/templates/config_directories.tmpl b/main/interfaces/Default/templates/config_directories.tmpl
index eea9e1a..2997d3b 100644
--- a/main/interfaces/Default/templates/config_directories.tmpl
+++ b/main/interfaces/Default/templates/config_directories.tmpl
@@ -33,6 +33,16 @@
   <fieldset class="EntryFieldSet">
     <legend>User directories</legend>
     <emp>In "$my_home"</emp><br><br>
+    <strong>Download Directory:</strong><br>
+    Location to put unprocessed downloads in.<br>
+    <input type="text" size="40" name="download_dir" value="$download_dir">
+    <br>
+    <br>
+    <strong>Minimum free space for Download Directory:</strong><br>
+    Auto-pause when free space is beneath this value (MB).<br>
+    <input type="text" size="10" name="download_free" value="$download_free">
+    <br>
+    <br>
     <strong>Complete Directory:</strong><br>
     Location to put completed downloads in.<br>
     <input type="text" size="40" name="complete_dir" value="$complete_dir">
@@ -55,16 +65,6 @@
   <fieldset class="EntryFieldSet">
     <legend>System directories</legend>
     <emp>In "$my_lcldata"</emp><br><br>
-    <strong>Download Directory:</strong><br>
-    Location to put unprocessed downloads in.<br>
-    <input type="text" size="40" name="download_dir" value="$download_dir">
-    <br>
-    <br>
-    <strong>Minimum free space for Download Directory:</strong><br>
-    Auto-pause when free space is beneath this value (MB).<br>
-    <input type="text" size="10" name="download_free" value="$download_free">
-    <br>
-    <br>
     <strong>Cache Directory:</strong><br>
     Location for temporary storage.<br>
     <input type="text" size="40" name="cache_dir" value="$cache_dir">
diff --git a/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl b/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl
index 6cef74b..d301999 100644
--- a/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl
+++ b/main/interfaces/NOVA_0.3.2/templates/config_directories.tmpl
@@ -75,6 +75,16 @@
   <fieldset class="EntryFieldSet">
     <legend>User directories</legend>
     <emp>In "$my_home"</emp><br><br>
+    <strong>Download Directory:</strong><br>
+    Location to put unprocessed downloads in.<br>
+    <input type="text" size="40" name="download_dir" value="$download_dir">
+    <br>
+    <br>
+    <strong>Minimum free space for Download Directory:</strong><br>
+    Auto-pause when free space is beneath this value (MB).<br>
+    <input type="text" size="10" name="download_free" value="$download_free">
+    <br>
+    <br>
     <strong>Complete Directory:</strong><br>
     Location to put completed downloads in.<br>
     <input type="text" size="40" name="complete_dir" value="$complete_dir">
@@ -97,16 +107,6 @@
   <fieldset class="EntryFieldSet">
     <legend>System directories</legend>
     <emp>In "$my_lcldata"</emp><br><br>
-    <strong>Download Directory:</strong><br>
-    Location to put unprocessed downloads in.<br>
-    <input type="text" size="40" name="download_dir" value="$download_dir">
-    <br>
-    <br>
-    <strong>Minimum free space for Download Directory:</strong><br>
-    Auto-pause when free space is beneath this value (MB).<br>
-    <input type="text" size="10" name="download_free" value="$download_free">
-    <br>
-    <br>
     <strong>Cache Directory:</strong><br>
     Location for temporary storage.<br>
     <input type="text" size="40" name="cache_dir" value="$cache_dir">
diff --git a/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl b/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl
index 792036a..5da268d 100644
--- a/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl
+++ b/main/interfaces/NOVA_0.4.5/templates/config_directories.tmpl
@@ -30,6 +30,16 @@
   <fieldset class="EntryFieldSet">
     <legend>User directories</legend>
     <emp>In "$my_home"</emp><br><br>
+    <strong>Download Directory:</strong><br>
+    Location to put unprocessed downloads in.<br>
+    <input type="text" size="40" name="download_dir" value="$download_dir">
+    <br>
+    <br>
+    <strong>Minimum free space for Download Directory:</strong><br>
+    Auto-pause when free space is beneath this value (MB).<br>
+    <input type="text" size="10" name="download_free" value="$download_free">
+    <br>
+    <br>
     <strong>Complete Directory:</strong><br>
     Location to put completed downloads in.<br>
     <input type="text" size="40" name="complete_dir" value="$complete_dir">
@@ -52,16 +62,6 @@
   <fieldset class="EntryFieldSet">
     <legend>System directories</legend>
     <emp>In "$my_lcldata"</emp><br><br>
-    <strong>Download Directory:</strong><br>
-    Location to put unprocessed downloads in.<br>
-    <input type="text" size="40" name="download_dir" value="$download_dir">
-    <br>
-    <br>
-    <strong>Minimum free space for Download Directory:</strong><br>
-    Auto-pause when free space is beneath this value (MB).<br>
-    <input type="text" size="10" name="download_free" value="$download_free">
-    <br>
-    <br>
     <strong>Cache Directory:</strong><br>
     Location for temporary storage.<br>
     <input type="text" size="40" name="cache_dir" value="$cache_dir">
diff --git a/main/sabnzbd/__init__.py b/main/sabnzbd/__init__.py
index 0889fe0..c052312 100644
--- a/main/sabnzbd/__init__.py
+++ b/main/sabnzbd/__init__.py
@@ -254,7 +254,7 @@ def initialize(pause_downloader = False, clean_up = False, force_save= False):
     logging.debug("CREATE_CAT_FOLDERS -> %s", CREATE_CAT_FOLDERS)
     logging.debug("CREATE_CAT_SUB -> %s", CREATE_CAT_SUB)
 
-    DOWNLOAD_DIR = dir_setup(CFG, "download_dir", DIR_LCLDATA, DEF_DOWNLOAD_DIR)
+    DOWNLOAD_DIR = dir_setup(CFG, "download_dir", DIR_HOME, DEF_DOWNLOAD_DIR)
     if DOWNLOAD_DIR == "":
         return False
 
@@ -282,7 +282,7 @@ def initialize(pause_downloader = False, clean_up = False, force_save= False):
     try:
         defdir = CFG['misc']['dirscan_dir']
     except:
-        defdir = "nzb"
+        defdir = DEF_NZB_DIR
     dirscan_dir = dir_setup(CFG, "dirscan_dir", DIR_HOME, defdir)
 
     dirscan_speed = check_setting_int(CFG, 'misc', 'dirscan_speed', DEF_SCANRATE)
diff --git a/main/sabnzbd/constants.py b/main/sabnzbd/constants.py
index 4896f9a..e118679 100644
--- a/main/sabnzbd/constants.py
+++ b/main/sabnzbd/constants.py
@@ -54,11 +54,11 @@ BYTES_FILE_NAME  = 'bytes.sab'
 QUEUE_FILE_NAME  = 'queue.sab'
 RSS_FILE_NAME    = 'rss.sab'
 
-DEF_DOWNLOAD_DIR = 'incomplete'
-DEF_COMPLETE_DIR = 'downloads'
+DEF_DOWNLOAD_DIR = 'downloads/incomplete'
+DEF_COMPLETE_DIR = 'downloads/complete'
 DEF_CACHE_DIR    = 'cache'
 DEF_LOG_DIR      = 'logs'
-DEF_NZB_DIR      = 'nzb_backup'
+DEF_NZB_DIR      = ''
 DEF_NZBBACK_DIR  = ''
 DEF_INTERFACES   = 'interfaces'
 DEF_STDINTF      = 'Default'
diff --git a/main/sabnzbd/interface.py b/main/sabnzbd/interface.py
index 5449612..908a527 100644
--- a/main/sabnzbd/interface.py
+++ b/main/sabnzbd/interface.py
@@ -641,7 +641,7 @@ class ConfigDirectories(ProtectedClass):
                         cache_dir = None, nzb_backup_dir = None,
                         dirscan_dir = None, dirscan_speed = None, extern_proc = None):
                         
-        dd = create_real_path('download_dir', sabnzbd.DIR_LCLDATA, download_dir)
+        dd = create_real_path('download_dir', sabnzbd.DIR_HOME, download_dir)
         if not dd:
             return "Error: cannot create download directory %s." % dd