New project structure.
Merge pull request #637 from rdallasgray/project-persist

New project structure.