Final changes to project structure. Now builds and runs.