Renamed directories to follow a common pattern