diff --git a/ChangeLog b/ChangeLog
index 385e8faad..5ce862da9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,32 @@
+2003-04-27  Adam Fedor  <fedor@gnu.org>
+
+	* Updates for filesystem change.
+	* GNUmakefile (GNUSTEP_MAKEFILES): Remove
+	* ColorPickers/GNUmakefile, Documentation/GNUmakefile,
+	Images/GNUmakefile, KeyBindings/GNUmakefile, Model/GNUmakefile,
+	Panels/GNUmakefile, Panels/GNUmakefile.postamble, 
+	PrinterTypes/GNUmakefile, PrinterTypes/GNUmakefile.postamble,
+	Source/GNUmakefile, TextConverters/GNUmakefile, Tools/GNUmakefile: 
+	Idem and update install locations.
+	* Resources/GNUmakefile: Update for change in resource-set.make
+	* configure.ac: Replace $GNUSTEP_SYSTEM_ROOT/Makefiles with
+	$GNUSTEP_MAKEFILES.  Replace Libraries with Library/Libraries.
+	Replace Headers with Library/Headers.
+
+	* Source/NSImage.m (+initialize, +imageNamed:): Use
+	+pathForLibraryResource:ofType:inDirectory.
+	* Source/NSPrintInfo (+initPrintInfoDefaults): Idem.
+	* Source/NSPrinter.m (getFile): Idem.
+	* Source/NSSound.m (+initialize, +soundNamed:): Idem.
+	* Source/NSView.m (-_loadPrinterProlog): Idem.
+
+	* Source/NSPageLayout.m
+	(-initWithContentRect:styleMask:backing:defer:screen:): Use
+	GSGuiBundle to get resources.
+	* Source/NSPrintPanel.m
+	( -initWithContentRect:styleMask:backing:defer:screen:): Idem.
+	* Source/NSSpellChecker.m ([NSSpellChecker -init]): Idem.
+
 2003-03-27  Michael Hanni  <michael@deviant-behavior.com>
 
 	* Source/NSPopUpButtonCell.m (drawWithFrame:inView:): added a call 
diff --git a/ColorPickers/GNUmakefile b/ColorPickers/GNUmakefile
index 6d378b814..9fc49e861 100644
--- a/ColorPickers/GNUmakefile
+++ b/ColorPickers/GNUmakefile
@@ -29,8 +29,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES = ../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -38,7 +36,7 @@ include $(GNUSTEP_MAKEFILES)/common.make
 #BUNDLE_NAME = StandardPicker NamedPicker WheelPicker
 BUNDLE_NAME = StandardPicker WheelPicker
 
-BUNDLE_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Library/ColorPickers
+BUNDLE_INSTALL_DIR = $(GNUSTEP_LIBRARY)/ColorPickers
 
 ADDITIONAL_INCLUDE_DIRS += -I../Headers -I../Headers/gnustep
 
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 0e431b39c..e35ddb4ce 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -23,8 +23,6 @@
 # Install into the system root by default
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -69,7 +67,7 @@ BUGS_DOC_INSTALL_DIR = Developer/Gui/ReleaseNotes/$(VERSION)
 # file using the make file ../Source/DocMakefile.  If headers are added to the
 # library, you need to modify that file to get the autogsdoc tool to use them.
 #
-REF_DOC_INSTALL_DIR = $(GNUSTEP_INSTALLATION_DIR)/Documentation/Developer/Gui/Reference
+REF_DOC_INSTALL_DIR = $(GNUSTEP_DOCUMENTATION)/Developer/Gui/Reference
 
 -include GNUmakefile.preamble
 
diff --git a/GNUmakefile b/GNUmakefile
index 9e9661e6e..6efe01a4d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -33,8 +33,6 @@ PACKAGE_NEEDS_CONFIGURE = YES
 
 CVS_MODULE_NAME = gui
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
diff --git a/Images/GNUmakefile b/Images/GNUmakefile
index 212874a8f..6338f8aea 100644
--- a/Images/GNUmakefile
+++ b/Images/GNUmakefile
@@ -23,14 +23,12 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 include ../Version
 
-imagedir = $(GNUSTEP_RESOURCES)/Images
+imagedir = $(GNUSTEP_LIBRARY)/Images
 
 IMAGE_FILES = \
 GNUstep_Images_Copyright \
diff --git a/KeyBindings/GNUmakefile b/KeyBindings/GNUmakefile
index c8d7775b3..23572010f 100644
--- a/KeyBindings/GNUmakefile
+++ b/KeyBindings/GNUmakefile
@@ -24,12 +24,12 @@ include $(GNUSTEP_MAKEFILES)/common.make
 
 include $(GNUSTEP_MAKEFILES)/rules.make
 
-$(GNUSTEP_RESOURCES)/KeyBindings:
+$(GNUSTEP_LIBRARY)/KeyBindings:
 	$(MKINSTALLDIRS) $@
 
-after-install:: $(GNUSTEP_RESOURCES)/KeyBindings
+after-install:: $(GNUSTEP_LIBRARY)/KeyBindings
 	$(INSTALL_DATA) DefaultKeyBindings.dict \
-	                $(GNUSTEP_RESOURCES)/KeyBindings/
+	                $(GNUSTEP_LIBRARY)/KeyBindings/
 
 after-uninstall::
-	rm -f $(GNUSTEP_RESOURCES)/KeyBindings/DefaultKeyBindings.dict
+	rm -f $(GNUSTEP_LIBRARY)/KeyBindings/DefaultKeyBindings.dict
diff --git a/Model/GNUmakefile b/Model/GNUmakefile
index 6298f283d..f84c4ad8f 100644
--- a/Model/GNUmakefile
+++ b/Model/GNUmakefile
@@ -24,8 +24,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
diff --git a/Panels/GNUmakefile b/Panels/GNUmakefile
index a49329558..a4670defd 100644
--- a/Panels/GNUmakefile
+++ b/Panels/GNUmakefile
@@ -28,8 +28,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
@@ -37,9 +35,8 @@ include ../Version
 
 LANGUAGES = English
 
-LOCALIZED_RESOURCE_FILES = GSPrintPanel.gorm GSPageLayout.gorm
-
-PANELS = ColorPanel.gmodel SavePanel.gmodel SpellPanel.gmodel
+LOCALIZED_RESOURCE_FILES = GSPrintPanel.gorm GSPageLayout.gorm \
+	SpellPanel.gmodel
 
 -include GNUmakefile.preamble
 -include GNUmakefile.local
diff --git a/Panels/GNUmakefile.postamble b/Panels/GNUmakefile.postamble
index b888249a4..805bdef48 100644
--- a/Panels/GNUmakefile.postamble
+++ b/Panels/GNUmakefile.postamble
@@ -23,30 +23,17 @@
 #  If not, write to the Free Software Foundation,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-$(GNUSTEP_INSTALLATION_DIR)/Library/Model:
-	$(MKDIRS) $(GNUSTEP_INSTALLATION_DIR)/Library/Model
-
-before-install:: $(GNUSTEP_INSTALLATION_DIR)/Library/Model
-	for f in $(PANELS); do \
-	  $(INSTALL_DATA) $$f $(GNUSTEP_INSTALLATION_DIR)/Library/Model/; \
-	done
-
-before-uninstall::
-	for f in $(PANELS); do \
-		rm -f $(GNUSTEP_INSTALLATION_DIR)/Library/Model/$$f; \
-	done
-
 # Things to do after installing
 after-install::
 ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
 	@(echo "Copying localized resources into system..."; \
 	for l in $(LANGUAGES); do \
 	  if [ ! -f $$l.lproj ]; then \
-	    $(MKDIRS) $(GNUSTEP_RESOURCES)/$$l.lproj; \
+	    $(MKDIRS) $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
 	  fi; \
 	  for f in $(LOCALIZED_RESOURCE_FILES); do \
 	    if [ -f $$l.lproj/$$f ]; then \
-	      cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/$$l.lproj; \
+	      cp -r $$l.lproj/$$f $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
 	    fi; \
 	  done; \
 	done;)
@@ -57,7 +44,7 @@ after-uninstall::
 ifneq ($(strip $(LOCALIZED_RESOURCE_FILES)),)
 	@(for l in $(LANGUAGES); do \
 	  if [ ! -f $$l.lproj ]; then \
-	    rm -rf $(GNUSTEP_RESOURCES)/$$l.lproj; \
+	    rm -rf $(GNUSTEP_RESOURCES)/gnustep-gui/$$l.lproj; \
 	  fi; \
 	done;)
 endif
diff --git a/Panels/SpellPanel.gmodel b/Panels/SpellPanel.gmodel
deleted file mode 100644
index 4130d2f0d..000000000
--- a/Panels/SpellPanel.gmodel
+++ /dev/null
@@ -1,874 +0,0 @@
-{
-    "Object    1" = {elements = ("Object    2"); isa = NSMutableArray; }; 
-    "Object    2" = {
-        className = NSSpellChecker; 
-        isa = IMCustomObject; 
-        realObject = "Object    3"; 
-    }; 
-    "Object    3" = {
-        delegate = nil; 
-        isa = NSApplication; 
-        keyWindow = nil; 
-        mainMenu = nil; 
-        mainWindow = nil; 
-        windows = "Object    4"; 
-    }; 
-    "Object    4" = {
-        elements = ("Object    5", "Object    9", "Object   11"); 
-        isa = NSMutableArray; 
-    }; 
-    "Object    5" = {
-        backgroundColor = "Object    8"; 
-        backingType = 0; 
-        contentFrame = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}"; 
-        contentView = "Object    6"; 
-        frameAutosaveName = nil; 
-        hidesOnDeactivate = NO; 
-        initialFirstResponder = nil; 
-        isAutodisplay = NO; 
-        isReleasedWhenClosed = NO; 
-        isVisible = NO; 
-        isa = NSWindow; 
-        level = 0; 
-        maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}"; 
-        minSize = "{width=0.000000; height=0.000000}"; 
-        representedFilename = ""; 
-        styleMask = 0; 
-        title = ""; 
-    }; 
-    "Object    6" = {
-        autoresizesSubviews = YES; 
-        autoresizingMask = 0; 
-        bounds = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}"; 
-        frame = "{x=0.000000; y=0.000000; width=256.000000; height=128.000000}"; 
-        interfaceStyle = 0; 
-        isa = NSView; 
-        nextKeyView = nil; 
-        nextResponder = "Object    5"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = nil; 
-    }; 
-    "Object    7" = {elements = (); isa = NSMutableArray; }; 
-    "Object    8" = {
-        alpha = 1.000000; 
-        blue = 0.666667; 
-        brightness = 0.666667; 
-        colorSpaceName = NSCalibratedRGBColorSpace; 
-        green = 0.666667; 
-        hue = 0.000000; 
-        isa = NSColor; 
-        red = 0.666667; 
-        saturation = 0.000000; 
-    }; 
-    "Object    9" = {
-        backgroundColor = "Object    8"; 
-        backingType = 0; 
-        contentFrame = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}"; 
-        contentView = "Object   10"; 
-        frameAutosaveName = nil; 
-        hidesOnDeactivate = NO; 
-        initialFirstResponder = nil; 
-        isAutodisplay = NO; 
-        isReleasedWhenClosed = NO; 
-        isVisible = NO; 
-        isa = NSWindow; 
-        level = 0; 
-        maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}"; 
-        minSize = "{width=0.000000; height=0.000000}"; 
-        representedFilename = ""; 
-        styleMask = 0; 
-        title = ""; 
-    }; 
-    "Object   10" = {
-        autoresizesSubviews = YES; 
-        autoresizingMask = 0; 
-        bounds = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}"; 
-        frame = "{x=0.000000; y=0.000000; width=193.000000; height=208.000000}"; 
-        interfaceStyle = 0; 
-        isa = NSView; 
-        nextKeyView = nil; 
-        nextResponder = "Object    9"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = nil; 
-    }; 
-    "Object   11" = {
-        backgroundColor = "Object    8"; 
-        backingType = 2; 
-        becomesKeyOnlyIfNeeded = NO; 
-        contentFrame = "{x=311.000000; y=220.000000; width=186.000000; height=304.000000}"; 
-        contentView = "Object   12"; 
-        frameAutosaveName = nil; 
-        hidesOnDeactivate = YES; 
-        initialFirstResponder = nil; 
-        isAutodisplay = YES; 
-        isFloatingPanel = NO; 
-        isReleasedWhenClosed = NO; 
-        isVisible = NO; 
-        isa = NSPanel; 
-        level = 0; 
-        maxSize = "{width=340282346638528860000000000000000000000.000000; height=340282346638528860000000000000000000000.000000}"; 
-        minSize = "{width=0.000000; height=0.000000}"; 
-        representedFilename = ""; 
-        styleMask = 10; 
-        title = Spelling; 
-        worksWhenModal = NO; 
-    }; 
-    "Object   12" = {
-        autoresizesSubviews = YES; 
-        autoresizingMask = 0; 
-        bounds = "{x=0.000000; y=0.000000; width=186.000000; height=304.000000}"; 
-        frame = "{x=1.000000; y=9.000000; width=186.000000; height=304.000000}"; 
-        interfaceStyle = 0; 
-        isa = NSView; 
-        nextKeyView = nil; 
-        nextResponder = "Object   11"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object   13"; 
-        superview = nil; 
-    }; 
-    "Object   13" = {
-        elements = (
-            "Object   14", 
-            "Object   17", 
-            "Object   19", 
-            "Object   21", 
-            "Object   22", 
-            "Object   24", 
-            "Object   34"
-        ); 
-        isa = NSMutableArray; 
-    }; 
-    "Object   14" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 38; 
-        bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}"; 
-        cell = "Object   15"; 
-        frame = "{x=16.000000; y=40.000000; width=72.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-    }; 
-    "Object   15" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = Ignore; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   16" = {isa = NSFont; name = Helvetica; size = 12.000000; }; 
-    "Object   17" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 35; 
-        bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}"; 
-        cell = "Object   18"; 
-        frame = "{x=96.000000; y=40.000000; width=72.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-    }; 
-    "Object   18" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = Guess; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   19" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 35; 
-        bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}"; 
-        cell = "Object   20"; 
-        frame = "{x=96.000000; y=8.000000; width=72.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-    }; 
-    "Object   20" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = Correct; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   21" = {
-        acceptsArrowKeys = NO; 
-        allowsBranchSelection = NO; 
-        allowsEmptySelection = YES; 
-        allowsMultipleSelection = NO; 
-        autoresizesSubviews = NO; 
-        autoresizingMask = 18; 
-        bounds = "{x=0.000000; y=0.000000; width=152.000000; height=113.000000}"; 
-        cell = nil; 
-        delegate = nil; 
-        doubleAction = nil; 
-        frame = "{x=16.000000; y=96.000000; width=152.000000; height=113.000000}"; 
-        hasHorizontalScroller = NO; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isTitled = YES; 
-        isa = NSBrowser; 
-        maxVisibleColumns = 1; 
-        minColumnWidth = 1; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        path = ""; 
-        pathSeparator = /; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        reusesColumns = NO; 
-        sendsActionOnArrowKeys = NO; 
-        separatesColumns = YES; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-        takesTitleFromPreviousColumn = YES; 
-    }; 
-    "Object   22" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 38; 
-        bounds = "{x=0.000000; y=0.000000; width=72.000000; height=24.000000}"; 
-        cell = "Object   23"; 
-        frame = "{x=16.000000; y=8.000000; width=72.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-    }; 
-    "Object   23" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = "Find Next"; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   24" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 10; 
-        borderType = 3; 
-        bounds = "{x=0.000000; y=0.000000; width=152.000000; height=89.000000}"; 
-        contentView = "Object   26"; 
-        contentViewMargins = "{width=5.000000; height=5.000000}"; 
-        frame = "{x=16.000000; y=216.000000; width=152.000000; height=89.000000}"; 
-        interfaceStyle = 0; 
-        isa = NSBox; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object   25"; 
-        superview = "Object   12"; 
-        title = Dictionary; 
-        titleFont = "Object   16"; 
-        titlePosition = 2; 
-    }; 
-    "Object   25" = {elements = ("Object   26"); isa = NSMutableArray; }; 
-    "Object   26" = {
-        autoresizesSubviews = YES; 
-        autoresizingMask = 0; 
-        bounds = "{x=0.000000; y=0.000000; width=138.000000; height=66.000000}"; 
-        frame = "{x=7.000000; y=7.000000; width=138.000000; height=66.000000}"; 
-        interfaceStyle = 0; 
-        isa = NSView; 
-        nextKeyView = nil; 
-        nextResponder = "Object   24"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object   27"; 
-        superview = "Object   24"; 
-    }; 
-    "Object   27" = {
-        elements = ("Object   28", "Object   30", "Object   32"); 
-        isa = NSMutableArray; 
-    }; 
-    "Object   28" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 35; 
-        bounds = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}"; 
-        cell = "Object   29"; 
-        frame = "{x=72.000000; y=0.000000; width=64.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   26"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   26"; 
-        tag = 0; 
-    }; 
-    "Object   29" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = Forget; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   30" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 38; 
-        bounds = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}"; 
-        cell = "Object   31"; 
-        frame = "{x=0.000000; y=0.000000; width=64.000000; height=24.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSButton; 
-        nextKeyView = nil; 
-        nextResponder = "Object   26"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   26"; 
-        tag = 0; 
-    }; 
-    "Object   31" = {
-        action = nil; 
-        alignment = 2; 
-        alternateImage = nil; 
-        alternateTitle = ""; 
-        delay = 0.200000; 
-        entryType = 0; 
-        font = "Object   16"; 
-        highlightsBy = 14; 
-        image = nil; 
-        imagePosition = 0; 
-        interval = 0.025000; 
-        isBezeled = NO; 
-        isBordered = YES; 
-        isContinuous = NO; 
-        isEditable = NO; 
-        isEnabled = YES; 
-        isScrollable = NO; 
-        isSelectable = NO; 
-        isTransparent = NO; 
-        isa = NSButtonCell; 
-        keyEquivalent = ""; 
-        keyEquivalentFont = "Object   16"; 
-        keyEquivalentModifierMask = 0; 
-        sendActionMask = 0; 
-        showsStateBy = 0; 
-        state = 0; 
-        stringValue = 0; 
-        tag = 0; 
-        target = nil; 
-        title = Learn; 
-        type = 1; 
-        wraps = YES; 
-    }; 
-    "Object   32" = {
-        action = nil; 
-        autoresizingMask = 2; 
-        frame = "{x=0.000000; y=32.000000; width=136.000000; height=22.000000}"; 
-        isEnabled = YES; 
-        isa = NSPopUpButton; 
-        itemArray = ("Object   33"); 
-        pullsDown = NO; 
-        tag = 0; 
-        target = nil; 
-    }; 
-    "Object   33" = {
-        action = nil; 
-        image = nil; 
-        isEnabled = YES; 
-        isa = NSMenuItem; 
-        keyEquivalent = ""; 
-        representedObject = nil; 
-        state = 1; 
-        tag = 0; 
-        target = nil; 
-        title = English; 
-    }; 
-    "Object   34" = {
-        autoresizesSubviews = NO; 
-        autoresizingMask = 34; 
-        bounds = "{x=0.000000; y=0.000000; width=152.000000; height=21.000000}"; 
-        cell = "Object   35"; 
-        delegate = nil; 
-        errorAction = nil; 
-        frame = "{x=16.000000; y=72.000000; width=152.000000; height=21.000000}"; 
-        ignoresMultiClick = NO; 
-        interfaceStyle = 0; 
-        isEnabled = YES; 
-        isa = NSTextField; 
-        nextKeyView = nil; 
-        nextResponder = "Object   12"; 
-        postsBoundsChangedNotifications = YES; 
-        postsFrameChangedNotifications = YES; 
-        previousKeyView = nil; 
-        subviews = "Object    7"; 
-        superview = "Object   12"; 
-        tag = 0; 
-    }; 
-    "Object   35" = {
-        action = nil; 
-        alignment = 0; 
-        backgroundColor = "Object   36"; 
-        drawsBackground = YES; 
-        entryType = 0; 
-        font = "Object   16"; 
-        image = nil; 
-        isBezeled = YES; 
-        isBordered = NO; 
-        isContinuous = NO; 
-        isEditable = YES; 
-        isEnabled = YES; 
-        isScrollable = YES; 
-        isSelectable = YES; 
-        isa = NSTextFieldCell; 
-        sendActionMask = 0; 
-        state = 1; 
-        stringValue = ""; 
-        tag = 0; 
-        target = nil; 
-        textColor = "Object   37"; 
-        type = 1; 
-        wraps = NO; 
-    }; 
-    "Object   36" = {
-        alpha = 1.000000; 
-        blue = 1.000000; 
-        brightness = 1.000000; 
-        colorSpaceName = NSCalibratedRGBColorSpace; 
-        green = 1.000000; 
-        hue = 0.000000; 
-        isa = NSColor; 
-        red = 1.000000; 
-        saturation = 0.000000; 
-    }; 
-    "Object   37" = {
-        alpha = 1.000000; 
-        blue = 0.000000; 
-        brightness = 0.000000; 
-        colorSpaceName = NSCalibratedRGBColorSpace; 
-        green = 0.000000; 
-        hue = 0.000000; 
-        isa = NSColor; 
-        red = 0.000000; 
-        saturation = 0.000000; 
-    }; 
-    "Object   38" = {
-        elements = (
-            "Object   39", 
-            "Object   41", 
-            "Object   43", 
-            "Object   45", 
-            "Object   47", 
-            "Object   49", 
-            "Object   51", 
-            "Object   53", 
-            "Object   55", 
-            "Object   57", 
-            "Object   59", 
-            "Object   61", 
-            "Object   63", 
-            "Object   65", 
-            "Object   67", 
-            "Object   69", 
-            "Object   71", 
-            "Object   73", 
-            "Object   75", 
-            "Object   77", 
-            "Object   78", 
-            "Object   80", 
-            "Object   82", 
-            "Object   83", 
-            "Object   84", 
-            "Object   85", 
-            "Object   86", 
-            "Object   87", 
-            "Object   88", 
-            "Object   89"
-        ); 
-        isa = NSMutableArray; 
-    }; 
-    "Object   39" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   40"; 
-        source = "Object   28"; 
-    }; 
-    "Object   40" = {isa = NSString; string = "_forget:"; }; 
-    "Object   41" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   42"; 
-        source = "Object   30"; 
-    }; 
-    "Object   42" = {isa = NSString; string = "_learn:"; }; 
-    "Object   43" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   44"; 
-        source = "Object   17"; 
-    }; 
-    "Object   44" = {isa = NSString; string = "_guess:"; }; 
-    "Object   45" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   46"; 
-        source = "Object   22"; 
-    }; 
-    "Object   46" = {isa = NSString; string = "_findNext:"; }; 
-    "Object   47" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   48"; 
-        source = "Object   19"; 
-    }; 
-    "Object   48" = {isa = NSString; string = "_correct:"; }; 
-    "Object   49" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   50"; 
-        source = "Object   14"; 
-    }; 
-    "Object   50" = {isa = NSString; string = "_ignore:"; }; 
-    "Object   51" = {
-        destination = "Object   21"; 
-        isa = IMOutletConnector; 
-        label = "Object   52"; 
-        source = "Object    2"; 
-    }; 
-    "Object   52" = {isa = NSString; string = _accessoryView; }; 
-    "Object   53" = {
-        destination = "Object   34"; 
-        isa = IMOutletConnector; 
-        label = "Object   54"; 
-        source = "Object    2"; 
-    }; 
-    "Object   54" = {isa = NSString; string = _wordField; }; 
-    "Object   55" = {
-        destination = "Object   11"; 
-        isa = IMOutletConnector; 
-        label = "Object   56"; 
-        source = "Object    2"; 
-    }; 
-    "Object   56" = {isa = NSString; string = _spellPanel; }; 
-    "Object   57" = {
-        destination = "Object   32"; 
-        isa = IMOutletConnector; 
-        label = "Object   58"; 
-        source = "Object    2"; 
-    }; 
-    "Object   58" = {isa = NSString; string = _dictionaryPulldown; }; 
-    "Object   59" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   60"; 
-        source = "Object   32"; 
-    }; 
-    "Object   60" = {isa = NSString; string = "_switchDictionary:"; }; 
-    "Object   61" = {
-        destination = "Object    2"; 
-        isa = IMControlConnector; 
-        label = "Object   62"; 
-        source = "Object   21"; 
-    }; 
-    "Object   62" = {isa = NSString; string = "_highlightGuess:"; }; 
-    "Object   63" = {
-        destination = "Object    2"; 
-        isa = IMOutletConnector; 
-        label = "Object   64"; 
-        source = "Object   11"; 
-    }; 
-    "Object   64" = {isa = NSString; string = delegate; }; 
-    "Object   65" = {
-        destination = "Object   30"; 
-        isa = IMOutletConnector; 
-        label = "Object   66"; 
-        source = "Object    2"; 
-    }; 
-    "Object   66" = {isa = NSString; string = _learnButton; }; 
-    "Object   67" = {
-        destination = "Object   28"; 
-        isa = IMOutletConnector; 
-        label = "Object   68"; 
-        source = "Object    2"; 
-    }; 
-    "Object   68" = {isa = NSString; string = _forgetButton; }; 
-    "Object   69" = {
-        destination = "Object   14"; 
-        isa = IMOutletConnector; 
-        label = "Object   70"; 
-        source = "Object    2"; 
-    }; 
-    "Object   70" = {isa = NSString; string = _ignoreButton; }; 
-    "Object   71" = {
-        destination = "Object   17"; 
-        isa = IMOutletConnector; 
-        label = "Object   72"; 
-        source = "Object    2"; 
-    }; 
-    "Object   72" = {isa = NSString; string = _guessButton; }; 
-    "Object   73" = {
-        destination = "Object   22"; 
-        isa = IMOutletConnector; 
-        label = "Object   74"; 
-        source = "Object    2"; 
-    }; 
-    "Object   74" = {isa = NSString; string = _findNextButton; }; 
-    "Object   75" = {
-        destination = "Object   19"; 
-        isa = IMOutletConnector; 
-        label = "Object   76"; 
-        source = "Object    2"; 
-    }; 
-    "Object   76" = {isa = NSString; string = _correctButton; }; 
-    "Object   77" = {
-        destination = "Object    2"; 
-        isa = IMOutletConnector; 
-        label = "Object   64"; 
-        source = "Object   21"; 
-    }; 
-    "Object   78" = {
-        destination = "Object   19"; 
-        isa = IMOutletConnector; 
-        label = "Object   79"; 
-        source = "Object   11"; 
-    }; 
-    "Object   79" = {isa = NSString; string = initialFirstResponder; }; 
-    "Object   80" = {
-        destination = "Object   17"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   14"; 
-    }; 
-    "Object   81" = {isa = NSString; string = nextKeyView; }; 
-    "Object   82" = {
-        destination = "Object   22"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   17"; 
-    }; 
-    "Object   83" = {
-        destination = "Object   19"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   22"; 
-    }; 
-    "Object   84" = {
-        destination = "Object   28"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   30"; 
-    }; 
-    "Object   85" = {
-        destination = "Object   21"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   28"; 
-    }; 
-    "Object   86" = {
-        destination = "Object   34"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   21"; 
-    }; 
-    "Object   87" = {
-        destination = "Object   14"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   34"; 
-    }; 
-    "Object   88" = {
-        destination = "Object   30"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   32"; 
-    }; 
-    "Object   89" = {
-        destination = "Object   32"; 
-        isa = IMOutletConnector; 
-        label = "Object   81"; 
-        source = "Object   24"; 
-    }; 
-    RootObject = {Connections = "Object   38"; Objects = "Object    1"; isa = GMModel; }; 
-    TopLevelObjects = (RootObject); 
-    Version = 1; 
-}
diff --git a/PrinterTypes/GNUmakefile b/PrinterTypes/GNUmakefile
index c30ba4db3..bd8e4d152 100644
--- a/PrinterTypes/GNUmakefile
+++ b/PrinterTypes/GNUmakefile
@@ -23,14 +23,13 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 include ../Version
 
-INSTALL_DIR = $(GNUSTEP_RESOURCES)/PrinterTypes
+RES_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript
+PPD_INSTALL_DIR = $(GNUSTEP_LIBRARY)/PostScript/PPD
 
 RESOURCE_DIRS = \
 English.lproj	\
diff --git a/PrinterTypes/GNUmakefile.postamble b/PrinterTypes/GNUmakefile.postamble
index 5337c907e..f312ba52e 100644
--- a/PrinterTypes/GNUmakefile.postamble
+++ b/PrinterTypes/GNUmakefile.postamble
@@ -41,22 +41,22 @@
 # Things to do after compiling
 # after-all::
 
-$(INSTALL_DIR):
-	$(MKDIRS) $(INSTALL_DIR)
+$(PPD_INSTALL_DIR):
+	$(MKDIRS) $(PPD_INSTALL_DIR)
 
 # Things to do before installing
-before-install:: $(INSTALL_DIR)
+before-install:: $(PPD_INSTALL_DIR)
 
 # Things to do after installing
 after-install::
 	for dirs in $(RESOURCE_DIRS); do          \
-	  if [ ! -d $(INSTALL_DIR)/$$dirs ]; then  \
-	    $(MKDIRS) $(INSTALL_DIR)/$$dirs ;     \
+	  if [ ! -d $(PPD_INSTALL_DIR)/$$dirs ]; then  \
+	    $(MKDIRS) $(PPD_INSTALL_DIR)/$$dirs ;     \
 	  fi;                                     \
-	  $(INSTALL_DATA) $$dirs/*ppd $(INSTALL_DIR)/$$dirs/ ; \
+	  $(INSTALL_DATA) $$dirs/*ppd $(PPD_INSTALL_DIR)/$$dirs/ ; \
 	done;                                     \
 	for file in $(RESOURCE_FILES); do         \
-	  $(INSTALL_DATA) $$file $(INSTALL_DIR) ; \
+	  $(INSTALL_DATA) $$file $(RES_INSTALL_DIR) ; \
 	done
 
 # Things to do before uninstalling
@@ -65,9 +65,11 @@ after-install::
 # Things to do after uninstalling
 after-uninstall::
 	for file in $(RESOURCE_DIRS); do \
-	  rm -rf $(INSTALL_DIR)/$$file ; \
+	  rm -rf $(PPD_INSTALL_DIR)/$$file ; \
+	done
+	for file in $(RESOURCE_FILES); do         \
+	  rm $(RES_INSTALL_DIR)/$$file ; \
 	done
-	rm -rf $(INSTALL_DIR)
 
 # Things to do before cleaning
 # before-clean::
diff --git a/Resources/GNUmakefile b/Resources/GNUmakefile
index f296ace19..c22b67d0a 100644
--- a/Resources/GNUmakefile
+++ b/Resources/GNUmakefile
@@ -27,8 +27,7 @@ GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
 RESOURCE_SET_NAME = gui-resources
-gui-resources_RESOURCE_FILES_INSTALL_DIR = \
-  Libraries/Resources/gnustep-gui/Resources
+gui-resources_RESOURCE_FILES_INSTALL_DIR = gnustep-gui
 gui-resources_LANGUAGES = English Italian
 gui-resources_LOCALIZED_RESOURCE_FILES = Localizable.strings
 
diff --git a/Source/GNUmakefile b/Source/GNUmakefile
index 86d0a28a8..05b51a7e3 100644
--- a/Source/GNUmakefile
+++ b/Source/GNUmakefile
@@ -26,8 +26,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 
diff --git a/Source/GNUmakefile.preamble b/Source/GNUmakefile.preamble
index cb2e7a0c5..47f0390d9 100644
--- a/Source/GNUmakefile.preamble
+++ b/Source/GNUmakefile.preamble
@@ -43,9 +43,7 @@
 GNUSTEP_INSTALL_PREFIX=$(GNUSTEP_SYSTEM_ROOT)
 
 # Additional flags to pass to the preprocessor
-GNUSTEP_INSTALL_LIBDIR=$(GNUSTEP_LIBRARIES_ROOT)
-ADDITIONAL_CPPFLAGS = -DGNUSTEP_INSTALL_LIBDIR=\"$(GNUSTEP_INSTALL_LIBDIR)\" \
-	${DPS_DEFINE} \
+ADDITIONAL_CPPFLAGS =  \
 	-DGNUSTEP_INSTALL_PREFIX=$(GNUSTEP_INSTALL_PREFIX) \
 	-DGNUSTEP_TARGET_DIR=\"$(GNUSTEP_TARGET_DIR)\" \
 	-DGNUSTEP_TARGET_CPU=\"$(GNUSTEP_TARGET_CPU)\" \
diff --git a/Source/NSImage.m b/Source/NSImage.m
index 87c57dd83..10e924f8d 100644
--- a/Source/NSImage.m
+++ b/Source/NSImage.m
@@ -152,16 +152,9 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
 {
   if (self == [NSImage class])
     {
-#ifdef GNUSTEP_BASE_LIBRARY
-      NSString	*path = [NSBundle pathForGNUstepResource: @"nsmapping"
-				  ofType: @"strings"
-				  inDirectory: @"Images"];
-#else
-      NSBundle	*system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-      NSString	*path = [system pathForResource: @"nsmapping"
-					 ofType: @"strings"
-				    inDirectory: @"Images"];
-#endif
+      NSString *path = [NSBundle pathForLibraryResource: @"nsmapping"
+				                 ofType: @"strings"
+				             inDirectory: @"Images"];
 
       // Initial version
       [self setVersion: 1];
@@ -243,46 +236,23 @@ repd_for_rep(NSArray *_reps, NSImageRep *rep)
 	{
 	  if (ext)
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
-	      path = [NSBundle pathForGNUstepResource: the_name
-			       ofType: ext
-			       inDirectory: @"Images"];
-#else
-	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-	  
-	      path = [system pathForResource: the_name
-			     ofType: ext
-			     inDirectory: @"Images"];
-#endif 
+	      path = [NSBundle pathForLibraryResource: the_name
+				               ofType: ext
+				          inDirectory: @"Images"];
 	    }
 	  else 
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
 	      id o, e;
 
 	      e = [array objectEnumerator];
 	      while ((o = [e nextObject]))
 		{
-		  path = [NSBundle pathForGNUstepResource: the_name
-			       ofType: o
-			       inDirectory: @"Images"];
+		  path = [NSBundle pathForLibraryResource: the_name
+			       	                   ofType: o
+				              inDirectory: @"Images"];
 		  if (path != nil && [path length] != 0)
 		    break;
 		}
-#else
-	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-	      id o, e;
-
-	      e = [array objectEnumerator];
-	      while ((o = [e nextObject]))
-		{
-		  path = [system pathForResource: the_name
-					  ofType: o
-				     inDirectory: @"Images"];
-		  if (path != nil && [path length] != 0)
-		    break;
-		}
-#endif
 	    }
 	}
 
diff --git a/Source/NSPageLayout.m b/Source/NSPageLayout.m
index 0e02f503d..d7d693a02 100644
--- a/Source/NSPageLayout.m
+++ b/Source/NSPageLayout.m
@@ -42,6 +42,7 @@
 #include <AppKit/NSPrintInfo.h>
 #include <AppKit/NSPageLayout.h>
 #include <AppKit/NSPrinter.h>
+#include <AppKit/GSGuiPrivate.h>
 
 static NSPageLayout *shared_instance;
 
@@ -131,8 +132,8 @@ static NSPageLayout *shared_instance;
   if (self == nil)
     return nil;
 
-  panel = [NSBundle pathForGNUstepResource: GSPANELNAME ofType: @"gorm"
-		    inDirectory: nil];
+  panel = [GSGuiBundle() pathForResource: GSPANELNAME ofType: @"gorm"
+		             inDirectory: nil];
   if (panel == nil)
     {
       NSRunAlertPanel(@"Error", @"Could not find page layout resource", 
diff --git a/Source/NSPrintInfo.m b/Source/NSPrintInfo.m
index 27c96f5d1..7da01bf97 100644
--- a/Source/NSPrintInfo.m
+++ b/Source/NSPrintInfo.m
@@ -32,6 +32,7 @@
 #include <Foundation/NSDictionary.h>
 #include <Foundation/NSException.h>
 #include <Foundation/NSEnumerator.h>
+#include <Foundation/NSUserDefaults.h>
 #include <Foundation/NSValue.h>
 #include <AppKit/NSPrinter.h>
 
@@ -373,33 +374,19 @@ NSDictionary *paperSizes = nil;
 //
 + initPrintInfoDefaults
 {
+  NSUserDefaults *def;
   NSString *defPrinter, *str;
-  NSString *path;
   NSPrinter *printer;
 
-#ifdef GNUSTEP_BASE_LIBRARY
-  path = [NSBundle pathForGNUstepResource: @"PrintDefaults"
-				  ofType: nil
-				  inDirectory: @"PrinterAdmin"];
-#else
-  NSBundle *adminBundle;
-
-  adminBundle = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-  path = [adminBundle pathForResource: @"PrintDefaults" 
-		      ofType: nil
-		      inDirectory: @"PrinterAdmin"];
-#endif
-
-  defPrinter = nil;
-  if (path != nil && [path length] != 0)
-    {
-      printInfoDefaults = [NSMutableDictionary dictionaryWithContentsOfFile:path];
-      RETAIN(printInfoDefaults);
-      defPrinter = [printInfoDefaults objectForKey:NSPrintPrinter];
-      printer = [NSPrinter printerWithName: defPrinter];
-      if (printer == nil)
-	defPrinter = nil;
-    }
+  def = [NSUserDefaults standardUserDefaults];
+  printInfoDefaults = [def objectForKey: @"DefaultPrinter"];
+  if (printInfoDefaults)
+    printInfoDefaults = [printInfoDefaults mutableCopy];
+  defPrinter = [printInfoDefaults objectForKey:NSPrintPrinter];
+  if (defPrinter)
+    printer = [NSPrinter printerWithName: defPrinter];
+  if (printer == nil)
+    defPrinter = nil;
   if (printInfoDefaults == nil)
     {
       NSDebugLog(@"NSPrinter", @"Could not find printing defaults table");
diff --git a/Source/NSPrintPanel.m b/Source/NSPrintPanel.m
index d3b969b4a..dde5b1e1d 100644
--- a/Source/NSPrintPanel.m
+++ b/Source/NSPrintPanel.m
@@ -115,8 +115,8 @@ static NSPrintPanel *shared_instance;
   if (self == nil)
     return nil;
 
-  panel = [NSBundle pathForGNUstepResource: GSPANELNAME ofType: @"gorm"
-		    inDirectory: nil];
+  panel = [GSGuiBundle() pathForResource: GSPANELNAME ofType: @"gorm"
+		             inDirectory: nil];
   if (panel == nil)
     {
       NSRunAlertPanel(@"Error", @"Could not find print panel resource", 
diff --git a/Source/NSPrinter.m b/Source/NSPrinter.m
index 7865f7e80..2a4340835 100644
--- a/Source/NSPrinter.m
+++ b/Source/NSPrinter.m
@@ -56,7 +56,6 @@
 
 #include <AppKit/NSPrinter.h>
 
-
 // Define size used for the name and type maps - just use a small table
 #define NAMEMAPSIZE 0
 #define TYPEMAPSIZE 0
@@ -69,7 +68,7 @@
 			  [NSCharacterSet whitespaceAndNewlineCharacterSet]\
 			intoString:NULL]
 
-static NSString *NSPrinter_PATH = @"PrinterTypes";
+static NSString *NSPrinter_PATH = @"PostScript/PPD";
 static NSString *NSPrinter_INDEXFILE = @"Printers";
 
 //
@@ -212,9 +211,9 @@ static NSString *interpretQuotedValue(NSString *qString)
 
 static NSString *getFile(NSString *name, NSString *type)
 {
-  return [NSBundle pathForGNUstepResource: name
-		                   ofType: type
-		              inDirectory: NSPrinter_PATH];
+  return [NSBundle pathForLibraryResource: name
+				   ofType: type
+			      inDirectory: NSPrinter_PATH];
 }
 
 
@@ -882,17 +881,21 @@ andOptionTranslation:(NSString *)optionTranslation
 			     NAMEMAPSIZE);
 
   // Load the index file
-  path = getFile(NSPrinter_INDEXFILE, nil);
+  path = [NSBundle pathForLibraryResource: NSPrinter_INDEXFILE
+				   ofType: nil
+			      inDirectory: @"PostScript"];
   // If not found
   if (path == nil || [path length] == 0)
     {
-      [NSException raise:NSGenericException
-		   format:@"Could not find index of printers, file %@",
-		   NSPrinter_INDEXFILE];
-      // NOT REACHED
+      NSLog(@"Could not find index of printers, file %@", NSPrinter_INDEXFILE);
+      nameDict = [NSDictionary dictionaryWithObject:
+		    [NSArray arrayWithObjects: @"Apple_LaserWriter_II_NTX",
+					        @"localhost", @"A Note", nil]
+			                     forKey: @"Unknown"];
     }
-  // And create the name dictionary, loading it
-  nameDict = RETAIN([NSDictionary dictionaryWithContentsOfFile:path]);
+  else
+    nameDict = [NSDictionary dictionaryWithContentsOfFile:path];
+  RETAIN(nameDict);
   return self;
 }
 
diff --git a/Source/NSSound.m b/Source/NSSound.m
index e2e275f35..abe6cf108 100644
--- a/Source/NSSound.m
+++ b/Source/NSSound.m
@@ -351,17 +351,9 @@ return NO; \
 {
   if (self == [NSSound class]) 
     {
-#ifdef GNUSTEP_BASE_LIBRARY
-      NSString *path = [NSBundle pathForGNUstepResource: @"nsmapping"
-				 ofType: @"strings"
-				 inDirectory: @"Sounds"];
-#else
-      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-      NSString *path = [system pathForResource: @"nsmapping"
-			       ofType: @"strings"
-			       inDirectory: @"Sounds"];
-#endif
-
+      NSString *path = [NSBundle pathForLibraryResource: @"nsmapping"
+				                 ofType: @"strings"
+				             inDirectory: @"Sounds"];
       [self setVersion: 1];
 
       nameDict = [[NSMutableDictionary alloc] initWithCapacity: 10];
@@ -591,49 +583,24 @@ return NO; \
 	{
 	  if (extension) 
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
-	      path = [NSBundle pathForGNUstepResource: the_name
-			       ofType: extension
-			       inDirectory: @"Sounds"];
-#else
-	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-	  
-	      path = [system pathForResource: the_name
-			     ofType: extension
-			     inDirectory: @"Sounds"];
-#endif 
+	      path = [NSBundle pathForLibraryResource: the_name
+				               ofType: extension
+				          inDirectory: @"Sounds"];
 	    } 
 	  else 
 	    {
-#ifdef GNUSTEP_BASE_LIBRARY
 	      id o, e;
 
 	      e = [array objectEnumerator];
 	      while ((o = [e nextObject])) {
-		path = [NSBundle pathForGNUstepResource: the_name
-				 ofType: o
-				 inDirectory: @"Sounds"];
+	      path = [NSBundle pathForLibraryResource: the_name
+				               ofType: o
+				          inDirectory: @"Sounds"];
 		if (path != nil && [path length] != 0) 
 		  {
 		    break;
 		  }
 	      }
-#else
-	      NSBundle *system = [NSBundle bundleWithPath: @GNUSTEP_INSTALL_LIBDIR];
-	      id o, e;
-
-	      e = [array objectEnumerator];
-	      while ((o = [e nextObject])) 
-		{
-		  path = [system pathForResource: the_name
-				 ofType: o
-				 inDirectory: @"Sounds"];
-		  if (path != nil && [path length] != 0) 
-		    {
-		      break;
-		    }
-		}
-#endif
 	    }
 	}
 
diff --git a/Source/NSSpellChecker.m b/Source/NSSpellChecker.m
index 01fa871df..f74140b44 100644
--- a/Source/NSSpellChecker.m
+++ b/Source/NSSpellChecker.m
@@ -51,6 +51,7 @@
 #include <AppKit/NSGraphics.h>
 #include <AppKit/NSWindow.h>
 #include <AppKit/NSPanel.h>
+#include <AppKit/GSGuiPrivate.h>
 
 // prototype for function to create name for server
 NSString *GSSpellServerName(NSString *checkerDictionary, NSString *language);
@@ -267,7 +268,7 @@ static int __documentTag = 0;
   _ignoredWords = [NSMutableDictionary new];
 
   // Load the gmodel file
-  if(![NSBundle loadNibFile: @"SpellPanel.gmodel"
+  if(![GSGuiBundle() loadNibFile: @"SpellPanel.gmodel"
 	  externalNameTable: [NSDictionary dictionaryWithObject: self forKey: @"NSOwner"]
 	           withZone: [self zone]])
     {
diff --git a/Source/NSTextView.m b/Source/NSTextView.m
index 87ba01ac5..34088aef5 100644
--- a/Source/NSTextView.m
+++ b/Source/NSTextView.m
@@ -3360,6 +3360,10 @@ shouldRemoveMarker: (NSRulerMarker *)marker
   NSRange errorRange;
   int count = 0;
 
+  if (sp == nil)
+    {
+      return;
+    }
   errorRange = [sp checkSpellingOfString: [self string]
 		              startingAt: NSMaxRange (_layoutManager->_selected_range)
 		                language: [sp language]
diff --git a/Source/NSView.m b/Source/NSView.m
index 053c9aa77..98c85dd8c 100644
--- a/Source/NSView.m
+++ b/Source/NSView.m
@@ -3396,9 +3396,9 @@ static NSView* findByTag(NSView *view, int aTag, unsigned *level)
 - (void) _loadPrinterProlog: (NSGraphicsContext *)ctxt
 {
   NSString *prolog;
-  prolog = [NSBundle pathForGNUstepResource: @"GSProlog"
-                                     ofType: @"ps"
-                                inDirectory: @"PrinterTypes"];
+  prolog = [NSBundle pathForLibraryResource: @"GSProlog"
+				   ofType: @"ps"
+			      inDirectory: @"PostScript"];
   if (prolog == nil)
     {
       NSLog(@"Cannot find printer prolog file");
diff --git a/TextConverters/GNUmakefile b/TextConverters/GNUmakefile
index ac4e0fc44..8943ac9da 100644
--- a/TextConverters/GNUmakefile
+++ b/TextConverters/GNUmakefile
@@ -25,8 +25,6 @@
 #  If not, write to the Free Software Foundation,
 #  59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 include $(GNUSTEP_MAKEFILES)/common.make
 #
 # The list of subproject directories
diff --git a/Tools/GNUmakefile b/Tools/GNUmakefile
index e7379933a..908bda6f6 100644
--- a/Tools/GNUmakefile
+++ b/Tools/GNUmakefile
@@ -22,8 +22,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 GNUSTEP_LOCAL_ADDITIONAL_MAKEFILES=../gui.make
 include $(GNUSTEP_MAKEFILES)/common.make
 include ../config.make
diff --git a/Tools/gsnd/GNUmakefile b/Tools/gsnd/GNUmakefile
index 351aa739d..603a17a35 100644
--- a/Tools/gsnd/GNUmakefile
+++ b/Tools/gsnd/GNUmakefile
@@ -22,8 +22,6 @@
 
 GNUSTEP_INSTALLATION_DIR = $(GNUSTEP_SYSTEM_ROOT)
 
-GNUSTEP_MAKEFILES = $(GNUSTEP_SYSTEM_ROOT)/Makefiles
-
 include $(GNUSTEP_MAKEFILES)/common.make
 
 # The applications to be compiled
diff --git a/configure b/configure
index 71b7306da..e52d9e171 100755
--- a/configure
+++ b/configure
@@ -1206,7 +1206,7 @@ fi
 # Use config.guess, config.sub and install-sh provided by gnustep-make
 #--------------------------------------------------------------------
 ac_aux_dir=
-for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles; do
+for ac_dir in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
     ac_install_sh="$ac_aux_dir/install-sh -c"
@@ -1222,8 +1222,8 @@ for ac_dir in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefi
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&5
-echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_SYSTEM_ROOT/Makefiles $srcdir/$GNUSTEP_SYSTEM_ROOT/Makefiles" >&2;}
+  { { echo "$as_me:$LINENO: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&5
+echo "$as_me: error: cannot find install-sh or install.sh in $GNUSTEP_MAKEFILES $srcdir/$GNUSTEP_MAKEFILES" >&2;}
    { (exit 1); exit 1; }; }
 fi
 ac_config_guess="$SHELL $ac_aux_dir/config.guess"
@@ -1325,14 +1325,14 @@ test -n "$target_alias" &&
 # in the GNUstep root are used before the standard ones
 #--------------------------------------------------------------------
 # Set location of GNUstep dirs for later use
-GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
+GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
 if test "$GNUSTEP_FLATTENED" = yes; then
-  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
+  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
 else
-  clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
-  clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
+  clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
+  clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
   obj_dir=$clean_target_cpu/$clean_target_os
-  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
+  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
 fi
 CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"
diff --git a/configure.ac b/configure.ac
index bd155cabd..29b834e49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -32,7 +32,7 @@ fi
 #--------------------------------------------------------------------
 # Use config.guess, config.sub and install-sh provided by gnustep-make
 #--------------------------------------------------------------------
-AC_CONFIG_AUX_DIR($GNUSTEP_SYSTEM_ROOT/Makefiles)
+AC_CONFIG_AUX_DIR($GNUSTEP_MAKEFILES)
 
 AC_CONFIG_HEADER(Headers/gnustep/gui/config.h)
 
@@ -46,14 +46,14 @@ AC_CANONICAL_TARGET([])
 # in the GNUstep root are used before the standard ones
 #--------------------------------------------------------------------
 # Set location of GNUstep dirs for later use
-GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Headers
+GNUSTEP_HDIR=$GNUSTEP_SYSTEM_ROOT/Library/Headers
 if test "$GNUSTEP_FLATTENED" = yes; then
-  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries
+  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries
 else
-  clean_target_os=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_os.sh $target_os`
-  clean_target_cpu=`$GNUSTEP_SYSTEM_ROOT/Makefiles/clean_cpu.sh $target_cpu`
+  clean_target_os=`$GNUSTEP_MAKEFILES/clean_os.sh $target_os`
+  clean_target_cpu=`$GNUSTEP_MAKEFILES/clean_cpu.sh $target_cpu`
   obj_dir=$clean_target_cpu/$clean_target_os
-  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Libraries/$obj_dir
+  GNUSTEP_LDIR=$GNUSTEP_SYSTEM_ROOT/Library/Libraries/$obj_dir
 fi
 CPPFLAGS="$CPPFLAGS -I$GNUSTEP_HDIR"
 LDFLAGS="$LDFLAGS -L$GNUSTEP_LDIR/$LIBRARY_COMBO -L$GNUSTEP_LDIR"