Move herringbone to subdir