Module structure refactored