Major reorganization of files (made simpler).

Removed the project organization I was using - no need for anything
that complex for this demo.