Refactor into packages
Merge pull request #2 from tips48/master

Refactor into packages