Cleaned up and moved the demos
Removed some extraneous whitespace