Modules stucture refactored