Did some renaming and rearanging of files