renamed and moved things around
Merge pull request #276 from jkuk/master

renamed the project and moved all the files around