Renamed files for structure, updated paths