Move shape_cast into new organization