Updated for new folder layout (but not fully tested yet).
diff --git a/Mac/Distributions/binary.include b/Mac/Distributions/binary.include
index d5d061c..90fb361 100644
--- a/Mac/Distributions/binary.include
+++ b/Mac/Distributions/binary.include
@@ -14,44 +14,11 @@
 (':Extensions:Imaging', '')
 (':Extensions:Imaging:Tk', None)
 (':Extensions:Imaging:libImaging', None)
-(':Extensions:NumPy:Demo', '')
-(':Extensions:NumPy:Icon\015', None)
-(':Extensions:NumPy:Include:Icon\015', None)
-(':Extensions:NumPy:Install.txt', None)
-(':Extensions:NumPy:Makefile.pre.in', None)
-(':Extensions:NumPy:NumPy', '')
-(':Extensions:NumPy:NumPy:ArrayPrinter.py', '')
-(':Extensions:NumPy:NumPyLib:Icon\015', None)
-(':Extensions:NumPy:Readme-mac.txt', '')
-(':Extensions:NumPy:Setup', None)
-(':Extensions:NumPy:config.c.not', None)
-(':Extensions:NumPy:fast_umath.CFM68K.slb', None)
-(':Extensions:NumPy:fast_umath.ppc.slb', None)
-(':Extensions:NumPy:fftpack.CFM68K.slb', None)
-(':Extensions:NumPy:fftpack.ppc.slb', None)
-(':Extensions:NumPy:html', '')
-(':Extensions:NumPy:lapack_lite.CFM68K.slb', None)
-(':Extensions:NumPy:lapack_lite.ppc.slb', None)
-(':Extensions:NumPy:macmkaliases.py', '')
-(':Extensions:NumPy:makefile_nt.msc', None)
-(':Extensions:NumPy:multiarray.CFM68K.slb', None)
-(':Extensions:NumPy:multiarray.ppc.slb', None)
-(':Extensions:NumPy:numpy.mak', None)
-(':Extensions:NumPy:numpy.mdp', None)
-(':Extensions:NumPy:numpy_nt.def', None)
-(':Extensions:NumPy:numpymodules.CFM68K.slb', '')
-(':Extensions:NumPy:numpymodules.ppc.slb', '')
-(':Extensions:NumPy:ranlib.CFM68K.slb', None)
-(':Extensions:NumPy:ranlib.ppc.slb', None)
-(':Extensions:NumPy:test', '')
-(':Extensions:NumPy:umath.CFM68K.slb', None)
-(':Extensions:NumPy:umath.ppc.slb', None)
 (':Extensions:Pmw', None)
 (':Extensions:PyDOM', None)
 (':Extensions:README', None)
 (':Extensions:README.TOO', None)
 (':Extensions:audio', None)
-(':Extensions:img', '')
 (':Extensions:midi', None)
 (':Extensions:pyexpat', None)
 (':Extensions:saxlib', None)
@@ -65,7 +32,6 @@
 (':Mac:Contrib:BBPy:PythonSlave.py', '')
 (':Mac:Contrib:BBPy:README', '')
 (':Mac:Contrib:BBPy:source', None)
-(':Mac:Contrib:PyIDE-src', None)
 (':Mac:Contrib:PythonScript', '')
 (':Mac:Contrib:osam:OSAm.CFM68K.slb', '')
 (':Mac:Contrib:osam:OSAm.exp', None)
@@ -102,104 +68,22 @@
 (':Modules', None)
 (':Objects:Icon\015', None)
 (':Parser:Icon\015', None)
-(':PlugIns:AE.CFM68K.slb', None)
-(':PlugIns:AE.ppc.slb', None)
-(':PlugIns:Cm.CFM68K.slb', None)
-(':PlugIns:Cm.ppc.slb', None)
-(':PlugIns:ColorPicker.CFM68K.slb', '')
-(':PlugIns:ColorPicker.ppc.slb', '')
-(':PlugIns:Ctl.CFM68K.slb', None)
-(':PlugIns:Ctl.ppc.slb', None)
-(':PlugIns:Dlg.CFM68K.slb', None)
-(':PlugIns:Dlg.ppc.slb', None)
-(':PlugIns:Evt.CFM68K.slb', None)
-(':PlugIns:Evt.ppc.slb', None)
-(':PlugIns:Fm.CFM68K.slb', None)
-(':PlugIns:Fm.ppc.slb', None)
-(':PlugIns:Help.CFM68K.slb', None)
-(':PlugIns:Help.ppc.slb', None)
-(':PlugIns:Icon\015', None)
-(':PlugIns:List.CFM68K.slb', None)
-(':PlugIns:List.ppc.slb', None)
-(':PlugIns:Menu.CFM68K.slb', None)
-(':PlugIns:Menu.ppc.slb', None)
-(':PlugIns:Printing.CFM68K.slb', '')
-(':PlugIns:Qd.CFM68K.slb', None)
-(':PlugIns:Qd.ppc.slb', None)
-(':PlugIns:Qt.CFM68K.slb', None)
-(':PlugIns:Qt.ppc.slb', None)
-(':PlugIns:Res.CFM68K.slb', None)
-(':PlugIns:Res.ppc.slb', None)
-(':PlugIns:Scrap.CFM68K.slb', None)
-(':PlugIns:Scrap.ppc.slb', None)
-(':PlugIns:Snd.CFM68K.slb', None)
-(':PlugIns:Snd.ppc.slb', None)
-(':PlugIns:Sndihooks.ppc.slb', '')
-(':PlugIns:TE.CFM68K.slb', None)
-(':PlugIns:TE.ppc.slb', None)
-(':PlugIns:Win.CFM68K.slb', None)
-(':PlugIns:Win.ppc.slb', None)
-(':PlugIns:_tkinter.CFM68K.slb', None)
-(':PlugIns:_tkinter.ppc.slb', None)
-(':PlugIns:calldll.ppc.slb', '')
-(':PlugIns:ctb.CFM68K.slb', None)
-(':PlugIns:ctb.ppc.slb', '')
-(':PlugIns:gdbm.CFM68K.slb', '')
-(':PlugIns:gdbm.ppc.slb', '')
-(':PlugIns:icglue.CFM68K.slb', '')
-(':PlugIns:icglue.ppc.slb', '')
-(':PlugIns:imgcolormap.CFM68K.slb', None)
-(':PlugIns:imgcolormap.ppc.slb', None)
-(':PlugIns:imgformat.CFM68K.slb', None)
-(':PlugIns:imgformat.ppc.slb', None)
-(':PlugIns:imggif.CFM68K.slb', None)
-(':PlugIns:imggif.ppc.slb', None)
-(':PlugIns:imgjpeg.CFM68K.slb', None)
-(':PlugIns:imgjpeg.ppc.slb', None)
-(':PlugIns:imgmodules.CFM68K.slb', '')
-(':PlugIns:imgmodules.ppc.slb', '')
-(':PlugIns:imgop.CFM68K.slb', None)
-(':PlugIns:imgop.ppc.slb', None)
-(':PlugIns:imgpbm.CFM68K.slb', None)
-(':PlugIns:imgpbm.ppc.slb', None)
-(':PlugIns:imgpgm.CFM68K.slb', None)
-(':PlugIns:imgpgm.ppc.slb', None)
-(':PlugIns:imgppm.CFM68K.slb', None)
-(':PlugIns:imgppm.ppc.slb', None)
-(':PlugIns:imgsgi.CFM68K.slb', None)
-(':PlugIns:imgsgi.ppc.slb', None)
-(':PlugIns:imgtiff.CFM68K.slb', None)
-(':PlugIns:imgtiff.ppc.slb', None)
-(':PlugIns:macspeech.ppc.slb', '')
-(':PlugIns:qtmodules.CFM68K.slb', '')
-(':PlugIns:qtmodules.ppc.slb', '')
-(':PlugIns:toolboxmodules.CFM68K.slb', '')
-(':PlugIns:toolboxmodules.ppc.slb', '')
-(':PlugIns:waste.CFM68K.slb', '')
-(':PlugIns:waste.ppc.slb', '')
-(':PlugIns:xx.ppc.slb', None)
-(':PlugIns:zlib.CFM68K.slb', '')
-(':PlugIns:zlib.ppc.slb', '')
 (':Python:Icon\015', None)
-(':PythonApplet', '')
 (':PythonCore', '')
-(':PythonFAT', '')
+(':PythonStandSmall', None)
 (':Tools:Icon\015', None)
 (':Tools:README', '')
+(':Tools:audiopy', '')
 (':Tools:bgen', None)
 (':Tools:faqwiz', '')
 (':Tools:freeze', '')
+(':Tools:idle', '')
 (':Tools:modulator', None)
+(':Tools:pynche', '')
 (':Tools:scripts', '')
 (':Tools:versioncheck', '')
 (':Tools:webchecker', '')
-(':build.mac', None)
-(':build.macstand:Icon\015', None)
-(':build.macstand:Python68K', ':Python68K')
-(':build.macstand:PythonSmCFM68K', None)
-(':build.macstand:PythonSmall68K', None)
-(':build.macstand:PythonStandSmall', None)
-(':build.macstand:PythonStandalone', None)
+(':Tools:world', '')
 (':jack-scripts', None)
 (':loop.py', None)
 (':mac2unix-real.shar', None)
@@ -209,10 +93,52 @@
 (':readmefiles:Icon\015', None)
 (':readmefiles:README', ':relnotes:')
 (':site-packages', None)
-(':PythonStandSmall', None)
-(':PlugIns:Printing.ppc.slb', '')
-(':PlugIns:Sndihooks.CFM68K.slb', '')
-(':Tools:audiopy', '')
-(':Tools:pynche', '')
-(':Tools:world', '')
-(':Tools:idle', '')
+(':install-sh', None)
+(':configure', None)
+(':Python IDE', '')
+(':PythonInterpreter', '')
+(':Extensions:img:doc', None)
+(':Extensions:img:Lib', '')
+(':Extensions:img:README.img', '')
+(':Extensions:img:Mac', '')
+(':Extensions:img:test', '')
+(':Extensions:img:test:out-grey-t2b.jpg', None)
+(':Extensions:img:test:out-grey-t2b-rgbviatiff.ppm', None)
+(':Extensions:img:test:out-grey-t2b-greyviatiff.pgm', None)
+(':Extensions:img:test:out-grey-b2t.rgb', None)
+(':Extensions:img:test:out-grey-b2t.pgm', None)
+(':Extensions:img:test:out-icon.pgm', None)
+(':Extensions:img:test:out-icon.pbm', None)
+(':Extensions:img:test:out-grey-t2b.tiff', None)
+(':Extensions:img:test:out-grey-t2b.rgb', None)
+(':Extensions:img:test:out-grey-t2b.pgm', None)
+(':Extensions:img:test:out-rgb-b2t.ppm', None)
+(':Extensions:img:test:out-rgb-b2t-viagif.ppm', None)
+(':Extensions:img:test:out-mono-t2b.pbm', None)
+(':Extensions:img:test:out-map-t2b.gif', None)
+(':Extensions:img:test:out-map-t2b-2.gif', None)
+(':Extensions:img:test:out-rgb-t2b.ppm', None)
+(':Extensions:img:test:out-rgb-t2b.jpg', None)
+(':Extensions:img:test:out-rgb-t2b-viajpeg.ppm', None)
+(':Extensions:img:test:out-rgb-t2b-viagif.ppm', None)
+(':Extensions:img:test:out-rgb-b2t.rgb', None)
+(':Extensions:img:test:out-rgb-t2b.tiff', None)
+(':Extensions:img:test:out-rgb-t2b.rgb', None)
+(':Extensions:Numerical:Credits.htm', '')
+(':Extensions:Numerical:Demo', '')
+(':Extensions:Numerical:Doc', '')
+(':Extensions:Numerical:makethis.py', None)
+(':Extensions:Numerical:installthis.py', None)
+(':Extensions:Numerical:README.htm', '')
+(':Extensions:Numerical:Setup', None)
+(':Extensions:Numerical:Lib', '')
+(':Extensions:Numerical:Mac', None)
+(':Extensions:Numerical:Src', None)
+(':Extensions:Numerical:Test', '')
+(':Extensions:Numerical:Tools', None)
+(':Extensions:NumPy', None)
+(':Extensions:pygui', None)
+(':Mac:Build', None)
+(':Mac:Contrib:Sherlock', '')
+(':Mac:PlugIns', '')
+(':Mac:Tools:IDE', '')