Code Clean-up P1

The majority of code cleaning. With this I am posting the first release
online for access.
This version is not complete and is intended more for internal
presentation than anything else.