Refactired Modules classes and interface architecture