Renamed some folders to be more consistent.