Renamed directories to match master