Renamed directories names to something more sane.