Refactoring module-structure