CLEANUP - Turned on nuget restore and started refactoring.