Clean up the API a bit, and then progressively fixing the ZGuide examples, and moving the working samples into the guide folder.