issue 6

- rename files and modules so that they align with the wiki
Merge pull request #7 from quatrano/issue_6

issue 6