v0.5 refactor
Completed refactor
Merge pull request #1 from Legoless/refactor

Refactor