diff --git a/Mac/Lib/toolbox/AEObjects.py b/Mac/Lib/lib-toolbox/AEObjects.py
similarity index 100%
rename from Mac/Lib/toolbox/AEObjects.py
rename to Mac/Lib/lib-toolbox/AEObjects.py
diff --git a/Mac/Lib/toolbox/AERegistry.py b/Mac/Lib/lib-toolbox/AERegistry.py
similarity index 100%
rename from Mac/Lib/toolbox/AERegistry.py
rename to Mac/Lib/lib-toolbox/AERegistry.py
diff --git a/Mac/Lib/toolbox/AppleEvents.py b/Mac/Lib/lib-toolbox/AppleEvents.py
similarity index 100%
rename from Mac/Lib/toolbox/AppleEvents.py
rename to Mac/Lib/lib-toolbox/AppleEvents.py
diff --git a/Mac/Lib/toolbox/Components.py b/Mac/Lib/lib-toolbox/Components.py
similarity index 100%
rename from Mac/Lib/toolbox/Components.py
rename to Mac/Lib/lib-toolbox/Components.py
diff --git a/Mac/Lib/toolbox/Controls.py b/Mac/Lib/lib-toolbox/Controls.py
similarity index 100%
rename from Mac/Lib/toolbox/Controls.py
rename to Mac/Lib/lib-toolbox/Controls.py
diff --git a/Mac/Lib/toolbox/Dialogs.py b/Mac/Lib/lib-toolbox/Dialogs.py
similarity index 100%
rename from Mac/Lib/toolbox/Dialogs.py
rename to Mac/Lib/lib-toolbox/Dialogs.py
diff --git a/Mac/Lib/toolbox/Events.py b/Mac/Lib/lib-toolbox/Events.py
similarity index 100%
rename from Mac/Lib/toolbox/Events.py
rename to Mac/Lib/lib-toolbox/Events.py
diff --git a/Mac/Lib/toolbox/Fonts.py b/Mac/Lib/lib-toolbox/Fonts.py
similarity index 100%
rename from Mac/Lib/toolbox/Fonts.py
rename to Mac/Lib/lib-toolbox/Fonts.py
diff --git a/Mac/Lib/toolbox/Lists.py b/Mac/Lib/lib-toolbox/Lists.py
similarity index 100%
rename from Mac/Lib/toolbox/Lists.py
rename to Mac/Lib/lib-toolbox/Lists.py
diff --git a/Mac/Lib/toolbox/Menus.py b/Mac/Lib/lib-toolbox/Menus.py
similarity index 100%
rename from Mac/Lib/toolbox/Menus.py
rename to Mac/Lib/lib-toolbox/Menus.py
diff --git a/Mac/Lib/toolbox/MiniAEFrame.py b/Mac/Lib/lib-toolbox/MiniAEFrame.py
similarity index 100%
rename from Mac/Lib/toolbox/MiniAEFrame.py
rename to Mac/Lib/lib-toolbox/MiniAEFrame.py
diff --git a/Mac/Lib/toolbox/QuickDraw.py b/Mac/Lib/lib-toolbox/QuickDraw.py
similarity index 100%
rename from Mac/Lib/toolbox/QuickDraw.py
rename to Mac/Lib/lib-toolbox/QuickDraw.py
diff --git a/Mac/Lib/toolbox/QuickTime.py b/Mac/Lib/lib-toolbox/QuickTime.py
similarity index 100%
rename from Mac/Lib/toolbox/QuickTime.py
rename to Mac/Lib/lib-toolbox/QuickTime.py
diff --git a/Mac/Lib/toolbox/Resources.py b/Mac/Lib/lib-toolbox/Resources.py
similarity index 100%
rename from Mac/Lib/toolbox/Resources.py
rename to Mac/Lib/lib-toolbox/Resources.py
diff --git a/Mac/Lib/toolbox/Sound.py b/Mac/Lib/lib-toolbox/Sound.py
similarity index 100%
rename from Mac/Lib/toolbox/Sound.py
rename to Mac/Lib/lib-toolbox/Sound.py
diff --git a/Mac/Lib/toolbox/TextEdit.py b/Mac/Lib/lib-toolbox/TextEdit.py
similarity index 100%
rename from Mac/Lib/toolbox/TextEdit.py
rename to Mac/Lib/lib-toolbox/TextEdit.py
diff --git a/Mac/Lib/toolbox/WASTEconst.py b/Mac/Lib/lib-toolbox/WASTEconst.py
similarity index 100%
rename from Mac/Lib/toolbox/WASTEconst.py
rename to Mac/Lib/lib-toolbox/WASTEconst.py
diff --git a/Mac/Lib/toolbox/Windows.py b/Mac/Lib/lib-toolbox/Windows.py
similarity index 94%
rename from Mac/Lib/toolbox/Windows.py
rename to Mac/Lib/lib-toolbox/Windows.py
index 157040f6cb9..7f54a2441bf 100644
--- a/Mac/Lib/toolbox/Windows.py
+++ b/Mac/Lib/lib-toolbox/Windows.py
@@ -1,4 +1,4 @@
-# Generated from 'flap:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Windows.h'
+# Generated from 'Moes:Metrowerks:Metrowerks CodeWarrior:MacOS Support:Headers:Universal Headers:Windows.h'
 
 kWindowDefProcType = 'WDEF'
 kStandardWindowDefinition = 0
diff --git a/Mac/Lib/toolbox/aepack.py b/Mac/Lib/lib-toolbox/aepack.py
similarity index 100%
rename from Mac/Lib/toolbox/aepack.py
rename to Mac/Lib/lib-toolbox/aepack.py
diff --git a/Mac/Lib/toolbox/aetools.py b/Mac/Lib/lib-toolbox/aetools.py
similarity index 100%
rename from Mac/Lib/toolbox/aetools.py
rename to Mac/Lib/lib-toolbox/aetools.py
diff --git a/Mac/Lib/toolbox/aetypes.py b/Mac/Lib/lib-toolbox/aetypes.py
similarity index 100%
rename from Mac/Lib/toolbox/aetypes.py
rename to Mac/Lib/lib-toolbox/aetypes.py