Fixed module structure issue