Module structure adjustments