Move files around to account for module structure expectations