Moved project to Src directory
Merged in Ken's additions