Renamed the file structure