[ot-shape] Move code around
7 files changed