finish modulize
Merge pull request #6 from Perpherior/feature/modulize

finish modulize