Layout the modules more clearly.