issue 6

- rename files and modules so that they align with the wiki