Refactor everything but project class
Finish refactor of Project class
Tie up loose ends; get all unit tests passing