module structure fix