Updated modules and renamed folders according to changes with shotgun.