Small restructure
Small restructure
Merge pull request #8 from MinekoRox/master

Small restructure