Cleaned up project file
Reorganized project so that the repository layout is easier to understand