Rename directories for more canonical objc structure