Merge pull request #23 from masud79/module-builder-refactoring

Code refactoring in Module Builder