Merge "Move sort headers out of directory layout." into nyc-andromeda-dev