Fix module folder structure