diff --git a/ChangeLog b/ChangeLog
index 444f0fb..92360b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2009-03-01 00:47  Sergii Stoian <stoyan255@gmail.com>
+
+	* Modules/Preferences/Build/PCBuildPrefs.h:
+	* Modules/Preferences/Build/PCBuildPrefs.m:
+	* Modules/Preferences/Build/Resources/BuildPrefs.gorm:
+	Move "Remove files in root build directory on quit" option
+	from here...
+	* Modules/Preferences/Misc/PCMiscPrefs.h:
+	* Modules/Preferences/Misc/PCMiscPrefs.m:
+	* Modules/Preferences/Misc/Resources/MiscPrefs.gorm:
+	to here.
+
 2009-03-01  Sergii Stoian <stoyan255@gmail.com>
 
 	* Framework/PCProjectManager.m:
diff --git a/Modules/Preferences/Build/PCBuildPrefs.h b/Modules/Preferences/Build/PCBuildPrefs.h
index 1bb6f03..52affdc 100644
--- a/Modules/Preferences/Build/PCBuildPrefs.h
+++ b/Modules/Preferences/Build/PCBuildPrefs.h
@@ -30,11 +30,12 @@
 #define PCDefaultBuildTool @"/usr/bin/make"
 #endif
 
-#define SuccessSound       @"SuccessSound"
-#define FailureSound       @"FailureSound"
-#define RootBuildDirectory @"RootBuildDirectory"
-#define BuildTool          @"BuildTool"
-#define PromptOnClean      @"PromtOnClean"
+#define SuccessSound            @"SuccessSound"
+#define FailureSound            @"FailureSound"
+#define RootBuildDirectory      @"RootBuildDirectory"
+#define BuildTool               @"BuildTool"
+#define DeleteCacheWhenQuitting @"DeleteBuildCacheWhenQuitting"
+#define PromptOnClean           @"PromtOnClean"
 
 @interface PCBuildPrefs : NSObject <PCPrefsSection>
 {
@@ -52,6 +53,7 @@
   IBOutlet NSTextField *buildToolField;
   IBOutlet NSButton    *setBuildToolButton;
 
+  IBOutlet NSButton    *deleteCache;
   IBOutlet NSButton    *promptOnClean;
 }
 
diff --git a/Modules/Preferences/Build/PCBuildPrefs.m b/Modules/Preferences/Build/PCBuildPrefs.m
index 41a91de..8f7507c 100644
--- a/Modules/Preferences/Build/PCBuildPrefs.m
+++ b/Modules/Preferences/Build/PCBuildPrefs.m
@@ -58,6 +58,7 @@
   [setRootBuildDirButton setRefusesFirstResponder:YES];
   [setBuildToolButton setRefusesFirstResponder:YES];
 
+  [deleteCache setRefusesFirstResponder:YES];
   [promptOnClean setRefusesFirstResponder:YES];
 }
 
@@ -81,6 +82,7 @@
   [prefs setObject:@"" forKey:FailureSound];
   [prefs setObject:@"" forKey:RootBuildDirectory];
   [prefs setObject:PCDefaultBuildTool forKey:BuildTool];
+  [prefs setObject:@"YES" forKey:DeleteCacheWhenQuitting];
   [prefs setObject:@"YES" forKey:PromptOnClean];
 }
 
@@ -104,6 +106,10 @@
     val = PCDefaultBuildTool;
   [buildToolField setStringValue:val];
 
+  val = [prefs objectForKey:DeleteCacheWhenQuitting];
+  state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState;
+  [deleteCache setState:state];
+
   val = [prefs objectForKey:PromptOnClean];
   state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState;
   [promptOnClean setState:state];
@@ -241,6 +247,20 @@
   [[buildingView window] makeFirstResponder:buildToolField];
 }
 
+- (void)setDeleteCache:(id)sender
+{
+  NSString *state;
+
+  if (deleteCache == nil)
+    {// HACK!!! need to be fixed in GNUstep
+      deleteCache = sender;
+      return;
+    }
+
+  state = ([sender state] == NSOffState) ? @"NO" : @"YES";
+  [prefs setObject:state forKey:DeleteCacheWhenQuitting];
+}
+
 - (void)setPromptOnClean:(id)sender
 {
   NSString *state;
diff --git a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes
index dd7f6bf..69e5f4c 100644
--- a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes
+++ b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/data.classes
@@ -2,6 +2,7 @@
     "## Comment" = "Do NOT change this file, Gorm maintains it";
     FirstResponder = {
 	Actions = (
+	    "setDeleteCache:",
 	    "setBuildTool:",
 	    "setFailureSound:",
 	    "setPromptOnClean:",
@@ -16,7 +17,8 @@
 	    "setFailureSound:",
 	    "setRootBuildDir:",
 	    "setSuccessSound:",
-	    "setBuildTool:"
+	    "setBuildTool:",
+	    "setDeleteCache:"
 	);
 	Outlets = (
 	    buildingView,
diff --git a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm
index 707ea40..65df3ac 100644
Binary files a/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm and b/Modules/Preferences/Build/Resources/BuildPrefs.gorm/objects.gorm differ
diff --git a/Modules/Preferences/Misc/PCMiscPrefs.h b/Modules/Preferences/Misc/PCMiscPrefs.h
index ba72cbd..d99eee0 100644
--- a/Modules/Preferences/Misc/PCMiscPrefs.h
+++ b/Modules/Preferences/Misc/PCMiscPrefs.h
@@ -31,7 +31,6 @@
 #endif
 
 #define PromptOnQuit            @"PromtOnQuit"
-#define DeleteCacheWhenQuitting @"DeleteBuildCacheWhenQuitting"
 #define FullPathInFilePanels    @"FullPathInFilePanels"
 #define Debugger                @"Debugger"
 #define Editor                  @"Editor"
@@ -43,7 +42,6 @@
   IBOutlet NSBox       *miscView;
 
   IBOutlet NSButton    *promptWhenQuit;
-  IBOutlet NSButton    *deleteCache;
   IBOutlet NSButton    *fullPathInFilePanels;
   IBOutlet NSTextField *debuggerField;
   IBOutlet NSButton    *debuggerButton;
diff --git a/Modules/Preferences/Misc/PCMiscPrefs.m b/Modules/Preferences/Misc/PCMiscPrefs.m
index 3014c6e..994510f 100644
--- a/Modules/Preferences/Misc/PCMiscPrefs.m
+++ b/Modules/Preferences/Misc/PCMiscPrefs.m
@@ -53,7 +53,6 @@
 - (void)awakeFromNib
 {
   [promptWhenQuit setRefusesFirstResponder:YES];
-  [deleteCache setRefusesFirstResponder:YES];
   [fullPathInFilePanels setRefusesFirstResponder:YES];
 
   [debuggerButton setRefusesFirstResponder:YES];
@@ -77,7 +76,6 @@
 - (void)setDefaults
 {
   [prefs setObject:@"YES" forKey:PromptOnQuit];
-  [prefs setObject:@"YES" forKey:DeleteCacheWhenQuitting];
   [prefs setObject:@"YES" forKey:FullPathInFilePanels];
   [prefs setObject:@"/usr/bin/gdb" forKey:Debugger];
   [prefs setObject:@"ProjectCenter" forKey:Editor];
@@ -92,10 +90,6 @@
   state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState;
   [promptWhenQuit setState:state];
 
-  val = [prefs objectForKey:DeleteCacheWhenQuitting];
-  state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState;
-  [deleteCache setState:state];
-
   val = [prefs objectForKey:FullPathInFilePanels];
   state = [val isEqualToString:@"YES"] ? NSOnState : NSOffState;
   [fullPathInFilePanels setState:state];
@@ -129,20 +123,6 @@
   [prefs setObject:state forKey:PromptOnQuit];
 }
 
-- (void)setDeleteCache:(id)sender
-{
-  NSString *state;
-
-  if (deleteCache == nil)
-    {// HACK!!! need to be fixed in GNUstep
-      deleteCache = sender;
-      return;
-    }
-
-  state = ([sender state] == NSOffState) ? @"NO" : @"YES";
-  [prefs setObject:state forKey:DeleteCacheWhenQuitting];
-}
-
 - (void)setFullPathInFilePanels:(id)sender
 {
   NSString *state;
diff --git a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes
index 8bca312..27bddb3 100644
--- a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes
+++ b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/data.classes
@@ -4,7 +4,6 @@
 	Actions = (
 	    "setEditor:",
 	    "setDebugger:",
-	    "setDeleteCache:",
 	    "setFullPathInFilePanels:",
 	    "setPromptWhenQuit:"
 	);
@@ -14,7 +13,6 @@
 	Actions = (
 	    "setEditor:",
 	    "setDebugger:",
-	    "setDeleteCache:",
 	    "setFullPathInFilePanels:",
 	    "setPromptWhenQuit:"
 	);
diff --git a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm
index 1bb6882..45cd06e 100644
Binary files a/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm and b/Modules/Preferences/Misc/Resources/MiscPrefs.gorm/objects.gorm differ