WIP cleanup of Shape and Layout, currently only the Shape pieces