More MacOS X tweaks
Restructure samples.