module structure fix 2