refactor base module
Merge pull request #20 from koboshi/develop

refactor base module