Merge pull request #1 from jemartti/master

Updating project structure
Fixing up things so it actually runs