diff --git a/GNUmakefile b/GNUmakefile
index c85b39d5..82505547 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -61,7 +61,6 @@ SUBPROJECTS = \
 	GormCore \
 	GormPrefs \
 	Palettes \
-	Plugins \
 	Tools
 
 #
diff --git a/GormCore/GNUmakefile b/GormCore/GNUmakefile
index deac4bc8..8698fbef 100644
--- a/GormCore/GNUmakefile
+++ b/GormCore/GNUmakefile
@@ -170,7 +170,11 @@ GormCore_OBJC_FILES = \
 	NSView+GormExtensions.m \
         GormPrivate.m
 
-GormCore_RESOURCE_FILES =
+GormCore_RESOURCE_FILES = \
+	Plugins/Gorm/Gorm.plugin \
+	Plugins/Nib/Nib.plugin \
+	Plugins/Xib/Xib.plugin \
+	Plugins/GModel/GModel.plugin
 
 -include GNUmakefile.preamble
 -include GNUmakefile.local
diff --git a/GormCore/Plugins/GModel/GNUmakefile.preamble b/GormCore/Plugins/GModel/GNUmakefile.preamble
index beccc87f..90f1bf3e 100644
--- a/GormCore/Plugins/GModel/GNUmakefile.preamble
+++ b/GormCore/Plugins/GModel/GNUmakefile.preamble
@@ -1,21 +1,21 @@
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../..
+ADDITIONAL_INCLUDE_DIRS += -I../../..
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
 endif
 ifeq ($(GNUSTEP_TARGET_OS),cygwin)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 GModel_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
 endif
\ No newline at end of file
diff --git a/GormCore/Plugins/GNUmakefile.preamble b/GormCore/Plugins/GNUmakefile.preamble
index bde268f3..198d097f 100644
--- a/GormCore/Plugins/GNUmakefile.preamble
+++ b/GormCore/Plugins/GNUmakefile.preamble
@@ -1,9 +1,8 @@
-#   GNUmakefile: main makefile for GNUstep Object Relationship Modeller
 #
 #   Copyright (C) 2003 Free Software Foundation, Inc.
 #
-#   Author:  Gregory John Casamento <greg_casamento@yahoo.com>
-#   Date: 2003
+#   Author:  Gregory John Casamento <greg,casamento@gmail.com>
+#   Date: 2023
 #   
 #   This file is part of GNUstep.
 #   
@@ -23,16 +22,9 @@
 #   USA.
 #
 
-#ADDITIONAL_TOOL_LIBS += \
-#	-lGormCore \
-#	-lGorm \
-#	-lGormObjCHeaderParser \
-#	-lGormPrefs \
-#	-lgnustep-base \
-#	-lgnustep-gui
-
 ADDITIONAL_INCLUDE_DIRS += \
-	-I../../
+	-I../../ \
+	-I../
 
 ADDITIONAL_LIB_DIRS += \
 	-L../../GormLib/$(GNUSTEP_OBJ_DIR) \
diff --git a/GormCore/Plugins/Gorm/GNUmakefile.preamble b/GormCore/Plugins/Gorm/GNUmakefile.preamble
index 3afa7b63..d5d73368 100644
--- a/GormCore/Plugins/Gorm/GNUmakefile.preamble
+++ b/GormCore/Plugins/Gorm/GNUmakefile.preamble
@@ -1,21 +1,21 @@
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../..
+ADDITIONAL_INCLUDE_DIRS += -I../../..
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
 endif
 ifeq ($(GNUSTEP_TARGET_OS),cygwin)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 Gorm_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
 endif
\ No newline at end of file
diff --git a/GormCore/Plugins/Nib/GNUmakefile.preamble b/GormCore/Plugins/Nib/GNUmakefile.preamble
index 5c5abbb6..2d0e7a6f 100644
--- a/GormCore/Plugins/Nib/GNUmakefile.preamble
+++ b/GormCore/Plugins/Nib/GNUmakefile.preamble
@@ -1,21 +1,21 @@
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../..
+ADDITIONAL_INCLUDE_DIRS += -I../../..
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
 endif
 ifeq ($(GNUSTEP_TARGET_OS),cygwin)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
 endif
\ No newline at end of file
diff --git a/GormCore/Plugins/Xib/GNUmakefile.preamble b/GormCore/Plugins/Xib/GNUmakefile.preamble
index 5c5abbb6..2d0e7a6f 100644
--- a/GormCore/Plugins/Xib/GNUmakefile.preamble
+++ b/GormCore/Plugins/Xib/GNUmakefile.preamble
@@ -1,21 +1,21 @@
 # Additional include directories the compiler should search
-ADDITIONAL_INCLUDE_DIRS += -I../..
+ADDITIONAL_INCLUDE_DIRS += -I../../..
 
 ifeq ($(GNUSTEP_TARGET_OS),mingw32)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 ADDITIONAL_GUI_LIBS += -lGorm -lGormCore
 endif
 ifeq ($(GNUSTEP_TARGET_OS),cygwin)
 ADDITIONAL_LIB_DIRS += \
-        -L../../GormLib/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
-        -L../../GormCore/$(GNUSTEP_OBJ_DIR)
+        -L../../../GormLib/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormObjCHeaderParser/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormPrefs/$(GNUSTEP_OBJ_DIR) \
+        -L../../../GormCore/$(GNUSTEP_OBJ_DIR)
 
 Nib_LIBRARIES_DEPEND_UPON += -lGorm -lGormCore
 endif
\ No newline at end of file
diff --git a/Tools/gormtool/AppDelegate.m b/Tools/gormtool/AppDelegate.m
index caedd4bb..8fce2dae 100644
--- a/Tools/gormtool/AppDelegate.m
+++ b/Tools/gormtool/AppDelegate.m
@@ -35,7 +35,7 @@
 
 - (void) applicationDidFinishLaunching: (NSNotification *)n
 {
-  NSLog(@"== gormtool");
+  puts("== gormtool");
 
   NSLog(@"processInfo: %@", [NSProcessInfo processInfo]);
   [self process];
@@ -43,4 +43,9 @@
   [NSApp terminate: nil];
 }
 
+- (void) applicationWillTerminate: (NSNotification *)n
+{
+  puts("== finished...");
+}
+
 @end