Renamed files, added server folder