diff --git a/ChangeLog b/ChangeLog
index f63f7f53..589734e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-05-14 17:46 Gregory John Casamento <greg_casamento@yahoo.com>
+
+	* GormButtonEditor.[hm]: Moved to the Controls palette, removed from
+	the main directory.   In general, inspectors and editors should
+	appear in the palette which provides those things.
+	* GormTabViewEditor.[hm]: Moved to Containers palette.
+	
 2004-05-14 11:36 Gregory John Casamento <greg_casamento@yahoo.com>
 
 	* GormButtonEditor.m: Added a line between some methods to 
diff --git a/GNUmakefile b/GNUmakefile
index e0eda7f7..974bac6d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -138,6 +138,7 @@ Gorm_HEADERS = \
 	GormPrivate.h \
 	GormCustomView.h \
 	GormOutlineView.h \
+	GormBoxEditor.h \
 	GormCustomClassInspector.h \
 	GormScrollViewAttributesInspector.h \
 	GormNSSplitViewInspector.h \
@@ -150,15 +151,12 @@ Gorm_HEADERS = \
 	GormViewWithContentViewEditor.h \
 	GormViewWindow.h \
 	GormViewKnobs.h \
-	GormBoxEditor.h \
 	GormClassManager.h \
 	GormControlEditor.h \
 	GormDocument.h \
 	GormFilesOwner.h \
 	GormInspectorsManager.h \
 	GormInternalViewEditor.h \
-	GormButtonEditor.h \
-	GormTabViewEditor.h \
 	GormSplitViewEditor.h \
 	GormPlacementInfo.h \
 	GormPrefController.h\
@@ -176,6 +174,7 @@ Gorm_OBJC_FILES = \
         Gorm.m \
 	GormDocument.m \
 	GModelDecoder.m \
+	GormBoxEditor.m \
 	GormCustomView.m \
 	GormViewKnobs.m \
 	GormFilesOwner.m \
@@ -194,11 +193,8 @@ Gorm_OBJC_FILES = \
 	GormViewWithSubviewsEditor.m \
 	GormViewWithContentViewEditor.m \
 	GormViewWindow.m \
-	GormBoxEditor.m \
 	GormControlEditor.m \
-	GormButtonEditor.m \
 	GormSplitViewEditor.m \
-	GormTabViewEditor.m \
 	GormInternalViewEditor.m \
 	GormPalettesManager.m \
 	GormOutlineView.m \
diff --git a/Palettes/2Controls/GNUmakefile b/Palettes/2Controls/GNUmakefile
index aa0a289c..938db635 100644
--- a/Palettes/2Controls/GNUmakefile
+++ b/Palettes/2Controls/GNUmakefile
@@ -28,7 +28,8 @@ PALETTE_NAME = 2Controls
 2Controls_OBJC_FILES = \
 	main.m \
 	inspectors.m \
-	GormPopUpButtonEditor.m
+	GormPopUpButtonEditor.m \
+	GormButtonEditor.m
 
 2Controls_PRINCIPAL_CLASS = ControlsPalette
 
diff --git a/GormButtonEditor.h b/Palettes/2Controls/GormButtonEditor.h
similarity index 100%
rename from GormButtonEditor.h
rename to Palettes/2Controls/GormButtonEditor.h
diff --git a/GormButtonEditor.m b/Palettes/2Controls/GormButtonEditor.m
similarity index 100%
rename from GormButtonEditor.m
rename to Palettes/2Controls/GormButtonEditor.m
diff --git a/Palettes/3Containers/GNUmakefile b/Palettes/3Containers/GNUmakefile
index 0e24cb19..656e6df5 100644
--- a/Palettes/3Containers/GNUmakefile
+++ b/Palettes/3Containers/GNUmakefile
@@ -31,12 +31,14 @@ PALETTE_NAME = 3Containers
 	GormNSBrowser.m \
 	GormNSTableView.m \
 	GormTableViewEditor.m \
+	GormTabViewEditor.m \
 	GormNSOutlineView.m
 
 3Containers_HEADER_FILES = \
 	GormNSBrowser.h \
 	GormNSTableView.h \
 	GormTableViewEditor.h \
+	GormTabViewEditor.h \
 	GormNSOutlineView.h
 
 3Containers_PRINCIPAL_CLASS = ContainersPalette
diff --git a/GormTabViewEditor.h b/Palettes/3Containers/GormTabViewEditor.h
similarity index 100%
rename from GormTabViewEditor.h
rename to Palettes/3Containers/GormTabViewEditor.h
diff --git a/GormTabViewEditor.m b/Palettes/3Containers/GormTabViewEditor.m
similarity index 100%
rename from GormTabViewEditor.m
rename to Palettes/3Containers/GormTabViewEditor.m