Fix module structure