Rearrange a whole load of shite
Also this
Bump
Merge pull request #6 from marvelexplorer/refactor

Refactor