Renamed some files and removed stacked folders