diff --git a/Applications/Gorm/GNUmakefile b/Applications/Gorm/GNUmakefile
index 32a1c1a5..16d96db7 100644
--- a/Applications/Gorm/GNUmakefile
+++ b/Applications/Gorm/GNUmakefile
@@ -88,6 +88,10 @@ Gorm_RESOURCE_FILES = \
 	Images/GormNib.tiff \
 	Images/GormPalette.tiff \
         Images/Gorm.tiff \
+        Images/GormSourceTag.tiff \
+        Images/GormTargetTag.tiff \
+        Images/GormLinkImage.tiff \
+        Images/GormTesting.tiff \
 
 
 Gorm_LOCALIZED_RESOURCE_FILES = \
diff --git a/Applications/Gorm/Gorm.m b/Applications/Gorm/Gorm.m
index 31c3f361..35a944be 100644
--- a/Applications/Gorm/Gorm.m
+++ b/Applications/Gorm/Gorm.m
@@ -100,7 +100,7 @@
     {
       NSNotificationCenter	*nc = [NSNotificationCenter defaultCenter];
       NSNotificationCenter      *ndc = [NSDistributedNotificationCenter defaultCenter];
-      NSBundle			*bundle = [NSBundle mainBundle];
+      NSBundle			*bundle = [NSBundle bundleForClass: [self class]];
       NSString			*path;
       NSConnection              *conn = [NSConnection defaultConnection];
 
diff --git a/GormCore/Images/GormLinkImage.tiff b/Applications/Gorm/Images/GormLinkImage.tiff
similarity index 100%
rename from GormCore/Images/GormLinkImage.tiff
rename to Applications/Gorm/Images/GormLinkImage.tiff
diff --git a/GormCore/Images/GormSourceTag.tiff b/Applications/Gorm/Images/GormSourceTag.tiff
similarity index 100%
rename from GormCore/Images/GormSourceTag.tiff
rename to Applications/Gorm/Images/GormSourceTag.tiff
diff --git a/GormCore/Images/GormTargetTag.tiff b/Applications/Gorm/Images/GormTargetTag.tiff
similarity index 100%
rename from GormCore/Images/GormTargetTag.tiff
rename to Applications/Gorm/Images/GormTargetTag.tiff
diff --git a/GormCore/Images/GormTesting.tiff b/Applications/Gorm/Images/GormTesting.tiff
similarity index 100%
rename from GormCore/Images/GormTesting.tiff
rename to Applications/Gorm/Images/GormTesting.tiff
diff --git a/GormCore/GNUmakefile b/GormCore/GNUmakefile
index 4f0035f3..c534a8c7 100644
--- a/GormCore/GNUmakefile
+++ b/GormCore/GNUmakefile
@@ -206,7 +206,6 @@ GormCore_RESOURCE_FILES = \
 	Images/GormFirstResponder.tiff \
 	Images/GormFontManager.tiff \
 	Images/GormImage.tiff \
-	Images/GormLinkImage.tiff \
 	Images/GormMenu.tiff \
 	Images/GormMHCoil.tiff \
 	Images/GormMHLine.tiff \
@@ -216,9 +215,6 @@ GormCore_RESOURCE_FILES = \
 	Images/GormOutletSelected.tiff \
 	Images/GormOutlet.tiff \
 	Images/GormSound.tiff \
-	Images/GormSourceTag.tiff \
-	Images/GormTargetTag.tiff \
-	Images/GormTesting.tiff \
 	Images/GormUnknown.tiff \
 	Images/GormView.tiff \
 	Images/GormWindow.tiff \