better module layout