diff --git a/Framework/English.lproj/Preferences.gorm/data.classes b/English.lproj/Preferences.gorm/data.classes
similarity index 100%
rename from Framework/English.lproj/Preferences.gorm/data.classes
rename to English.lproj/Preferences.gorm/data.classes
diff --git a/Framework/English.lproj/Preferences.gorm/data.info b/English.lproj/Preferences.gorm/data.info
similarity index 100%
rename from Framework/English.lproj/Preferences.gorm/data.info
rename to English.lproj/Preferences.gorm/data.info
diff --git a/Framework/English.lproj/Preferences.gorm/objects.gorm b/English.lproj/Preferences.gorm/objects.gorm
similarity index 100%
rename from Framework/English.lproj/Preferences.gorm/objects.gorm
rename to English.lproj/Preferences.gorm/objects.gorm
diff --git a/Framework/GNUmakefile b/Framework/GNUmakefile
index 968d136..8b39017 100644
--- a/Framework/GNUmakefile
+++ b/Framework/GNUmakefile
@@ -52,7 +52,6 @@ ProjectCenter_HEADER_FILES = \
   PCFileNameField.h \
   PCFileNameIcon.h \
   \
-  PCPrefController.h \
   PCLogController.h
 
 #
@@ -87,7 +86,6 @@ ProjectCenter_OBJC_FILES = \
   PCFileNameField.m \
   PCFileNameIcon.m \
   \
-  PCPrefController.m \
   PCLogController.m
 
 #
diff --git a/Framework/GNUmakefile.preamble b/Framework/GNUmakefile.preamble
index 61471b7..1216607 100644
--- a/Framework/GNUmakefile.preamble
+++ b/Framework/GNUmakefile.preamble
@@ -46,7 +46,7 @@ GDB := $(shell which gdb)
 ADDITIONAL_CPPFLAGS +=
 
 # Additional flags to pass to the Objective-C compiler
-ADDITIONAL_OBJCFLAGS += -W -DDEVELOPMENT\
+ADDITIONAL_OBJCFLAGS += -DDEVELOPMENT\
                         -DPCDefaultBuildTool=@"\"$(GMAKE)\"" \
                         -DPCDefaultDebugger=@"\"$(GDB)\""
 
diff --git a/Framework/PCProjectBuilder.m b/Framework/PCProjectBuilder.m
index 14ab5e8..54ca715 100644
--- a/Framework/PCProjectBuilder.m
+++ b/Framework/PCProjectBuilder.m
@@ -40,7 +40,7 @@
 #import <Protocols/CodeEditor.h>
 
 #import <ProjectCenter/PCLogController.h>
-#import <ProjectCenter/PCPrefController.h>
+#import <Protocols/Preferences.h>
 
 #ifndef IMAGE
 #define IMAGE(X) [NSImage imageNamed: X]
@@ -454,11 +454,14 @@
 // --- Actions
 - (BOOL)prebuildCheck
 {
-  PCPrefController *prefs = [PCPrefController sharedPCPreferences];
-  PCFileManager    *pcfm = [PCFileManager defaultManager];
-  NSFileManager    *fm = [NSFileManager defaultManager];
-  NSString         *buildDir = [prefs objectForKey:RootBuildDirectory];
-  NSString         *projectBuildDir;
+//  PCPrefController *prefs = [PCPrefController sharedPCPreferences];
+  id <PCPreferences> prefs = [[project projectManager] prefController];
+  NSString           *buildDir = [prefs objectForKey:RootBuildDirectory];
+  PCFileManager      *pcfm = [PCFileManager defaultManager];
+  NSFileManager      *fm = [NSFileManager defaultManager];
+  NSString           *projectBuildDir;
+
+  NSLog (@"BuildDir = %@", buildDir);
 
   // Checking prerequisites
   if ([project isProjectChanged])
diff --git a/Framework/PCProjectLoadedFiles.m b/Framework/PCProjectLoadedFiles.m
index 74df606..5b6ec1d 100644
--- a/Framework/PCProjectLoadedFiles.m
+++ b/Framework/PCProjectLoadedFiles.m
@@ -27,7 +27,6 @@
 #import <ProjectCenter/PCProject.h>
 #import <ProjectCenter/PCProjectEditor.h>
 
-#import <ProjectCenter/PCPrefController.h>
 #import <ProjectCenter/PCLogController.h>
 
 #import <Protocols/CodeEditor.h>
diff --git a/Framework/PCProjectManager.m b/Framework/PCProjectManager.m
index 244ba14..c9be603 100644
--- a/Framework/PCProjectManager.m
+++ b/Framework/PCProjectManager.m
@@ -24,7 +24,6 @@
 */
 
 #import <ProjectCenter/PCDefines.h>
-#import <ProjectCenter/PCPrefController.h>
 #import <ProjectCenter/PCLogController.h>
 
 #import <ProjectCenter/PCBundleManager.h>
@@ -127,7 +126,7 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
   prefController = aController;
 }
 
-- (id)prefController
+- (id <PCPreferences>)prefController
 {
   return prefController;
 }
@@ -198,8 +197,10 @@ NSString *PCActiveProjectDidChangeNotification = @"PCActiveProjectDidChange";
 {
   NSTimeInterval interval;
 
-  interval = [[[PCPrefController sharedPCPreferences] 
-    objectForKey:AutoSavePeriod] intValue];
+/*  interval = [[[PCPrefController sharedPCPreferences] 
+    objectForKey:AutoSavePeriod] intValue];*/
+
+  interval = [[prefController objectForKey:AutoSavePeriod] intValue];
 
   if (interval > 0 && saveTimer == nil)
     {
diff --git a/Framework/PCProjectWindow.m b/Framework/PCProjectWindow.m
index 347ec96..53dfc7e 100644
--- a/Framework/PCProjectWindow.m
+++ b/Framework/PCProjectWindow.m
@@ -38,7 +38,7 @@
 #import <ProjectCenter/PCProjectLoadedFiles.h>
 #import <ProjectCenter/PCProjectInspector.h>
 
-#import <ProjectCenter/PCPrefController.h>
+#import <Protocols/Preferences.h>
 #import <ProjectCenter/PCLogController.h>
 
 @implementation PCProjectWindow
@@ -338,7 +338,9 @@
   NSView  *view = [[project projectBuilder] componentView];
   NSPanel *buildPanel = [[project projectManager] buildPanel];
   
-  if ([[[PCPrefController sharedPCPreferences] objectForKey:SeparateBuilder]
+/*  if ([[[PCPrefController sharedPCPreferences] objectForKey:SeparateBuilder]
+      isEqualToString: @"YES"])*/
+  if ([[[[project projectManager] prefController] objectForKey:SeparateBuilder]
       isEqualToString: @"YES"])
     {
       if ([customView contentView] == view)
diff --git a/GNUmakefile b/GNUmakefile
index 6404779..6092544 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -98,7 +98,8 @@ Modules/Debuggers/ProjectCenter/ProjectCenter.debugger
 ProjectCenter_LOCALIZED_RESOURCE_FILES = \
 ProjectCenter.gorm \
 Info.gorm \
-FindPanel.gorm
+FindPanel.gorm \
+Preferences.gorm
 
 ProjectCenter_LANGUAGES = \
 English
@@ -110,7 +111,8 @@ English
 ProjectCenter_HEADERS = \
 Headers/PCAppController.h \
 Headers/PCInfoController.h \
-Headers/PCMenuController.h
+Headers/PCMenuController.h \
+Headers/PCPrefController.h
 
 #
 # Class files
@@ -119,6 +121,7 @@ ProjectCenter_OBJC_FILES = \
 PCAppController.m \
 PCInfoController.m \
 PCMenuController.m \
+PCPrefController.m \
 TextFinder.m \
 ProjectCenter_main.m
 
diff --git a/Headers/ProjectCenter/PCPrefController.h b/Headers/PCPrefController.h
similarity index 93%
rename from Headers/ProjectCenter/PCPrefController.h
rename to Headers/PCPrefController.h
index dea6639..b224ba6 100644
--- a/Headers/ProjectCenter/PCPrefController.h
+++ b/Headers/PCPrefController.h
@@ -25,8 +25,7 @@
 
 #import <AppKit/AppKit.h>
 
-#define PCSavePeriodDidChangeNotification @"PCSavePeriodDidChangeNotification"
-#define PCPreferencesDidChangeNotification @"PCPreferencesDidChangeNotification"
+#import <Protocols/Preferences.h>
 
 #ifndef PCDefaultBuildTool 
 #define PCDefaultBuildTool @"/usr/bin/make"
@@ -36,7 +35,7 @@
 #define PCDefaultDebugger @"/usr/bin/gdb"
 #endif
 
-@interface PCPrefController : NSObject
+@interface PCPrefController : NSObject <PCPreferences>
 {
   IBOutlet NSPanel       *panel;
   IBOutlet NSPopUpButton *popupButton;
@@ -94,8 +93,8 @@
 - (void)setDefaultValues;
 - (void)loadPreferences;
 
-- (NSDictionary *)preferencesDict;
-- (id)objectForKey:(NSString *)key;
+//- (NSDictionary *)preferencesDict;
+//- (id)objectForKey:(NSString *)key;
 - (NSString *)selectFileWithTypes:(NSArray *)types;
 - (void)showPanel:(id)sender;
 
diff --git a/Headers/ProjectCenter/PCProjectManager.h b/Headers/ProjectCenter/PCProjectManager.h
index 5bbd86a..d390280 100644
--- a/Headers/ProjectCenter/PCProjectManager.h
+++ b/Headers/ProjectCenter/PCProjectManager.h
@@ -28,6 +28,8 @@
 
 #import <AppKit/AppKit.h>
 
+#import <Protocols/Preferences.h>
+
 @class PCBundleManager;
 @class PCFileManager;
 @class PCEditorManager;
@@ -45,7 +47,7 @@ extern NSString *PCActiveProjectDidChangeNotification;
 @interface PCProjectManager : NSObject
 {
   id                  delegate;
-  id                  prefController;
+  id <PCPreferences>  prefController;
 
   PCBundleManager     *bundleManager;
   NSMutableDictionary *projectTypes;
@@ -91,7 +93,7 @@ extern NSString *PCActiveProjectDidChangeNotification;
 - (void)setDelegate:(id)aDelegate;
 - (id)delegate;
 - (void)setPrefController:(id)aController;
-- (id)prefController;
+- (id <PCPreferences>)prefController;
 
 - (void)createProjectTypeAccessaryView;
 - (NSMutableDictionary *)loadProjectTypesInfo;
diff --git a/PCAppController.m b/PCAppController.m
index 1f49f84..5ea35ea 100644
--- a/PCAppController.m
+++ b/PCAppController.m
@@ -19,13 +19,13 @@
    License along with this library; if not, write to the Free
    Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA.
 */
-#import <ProjectCenter/PCPrefController.h>
 #import <ProjectCenter/PCLogController.h>
 #import <ProjectCenter/PCFileManager.h>
 
 #import "PCAppController.h"
 #import "PCMenuController.h"
 #import "PCInfoController.h"
+#import "PCPrefController.h"
 
 #import <ProjectCenter/ProjectCenter.h>
 
diff --git a/Framework/PCPrefController.m b/PCPrefConrtroller.m
similarity index 99%
rename from Framework/PCPrefController.m
rename to PCPrefConrtroller.m
index 02ef657..ff9d1df 100644
--- a/Framework/PCPrefController.m
+++ b/PCPrefConrtroller.m
@@ -23,7 +23,8 @@
 #import <ProjectCenter/PCDefines.h>
 #import <ProjectCenter/PCLogController.h>
 
-#import <ProjectCenter/PCPrefController.h>
+#import "PCPrefController.h"
+#import <Protocols/Preferences.h>
 
 // TODO: rewrite it as PCPreferences, use +sharedPreferences instead of
 // [NSUserDefaults standardUserDefaults] in every part of ProjectCenter