Big project file re-org
Real project file reorg
Merge pull request #6 from GregPrice24/reorg

Reorg