Merge "Reorganize ahat source directory layout."