Updated to junkew's latest working copy
Run examples from their own folder
Code cleanup (but broke most of it)