Merge pull request #38 from dosen/design_improvement

Design improvement
module based