Move main project to its own dir
Merge pull request #22 from johnoliver/master

Move the main project into its own dir