More project clean up, preparing for restructuring and dependency injection additions
Spiked out projects for refactor. Added tests back in