modify plan and module structure