[util] Move shape options into shape-options.hh
7 files changed