Merge pull request #28 from jemc/master

Problem: Project structure is hard to keep updated