Reorganization of Project Files

Reorganized projects into one solution
reorg Part II