Renamed some folders for better clarity