Renamed some of the directories and states