Shuffle code around, remove shape_plan from complex shapers
6 files changed