Reorganizing project so it actually compiles.