Major Refactoring
Removed Temp Project