More progress.  Getting ready to start doing builds for testing.
Committing changes before restructuring project again.