House cleaning

Renamed a large number of files to start fresh.
Tests
Rebuild
Tests
Latest build