Refactored classes
Refactored duplicated code
Updated README
Merge pull request #7 from tangosource/feature/module_refactor

Feature/module refactor