Modify module structure for addapt context