diff --git a/Terminal.Gui/Drawing/ColorExtensions.cs b/Terminal.Gui/Drawing/Color.ColorExtensions.cs
similarity index 100%
rename from Terminal.Gui/Drawing/ColorExtensions.cs
rename to Terminal.Gui/Drawing/Color.ColorExtensions.cs
diff --git a/Terminal.Gui/Drawing/ColorName.cs b/Terminal.Gui/Drawing/Color.ColorName.cs
similarity index 100%
rename from Terminal.Gui/Drawing/ColorName.cs
rename to Terminal.Gui/Drawing/Color.ColorName.cs
diff --git a/Terminal.Gui/Drawing/ColorParseException.cs b/Terminal.Gui/Drawing/Color.ColorParseException.cs
similarity index 100%
rename from Terminal.Gui/Drawing/ColorParseException.cs
rename to Terminal.Gui/Drawing/Color.ColorParseException.cs
diff --git a/Terminal.Gui/Drawing/Colors.cs b/Terminal.Gui/Drawing/ColorScheme.Colors.cs
similarity index 100%
rename from Terminal.Gui/Drawing/Colors.cs
rename to Terminal.Gui/Drawing/ColorScheme.Colors.cs