Where's the old shapes gone from Photoshop, arrows, icons etc, now we have boats, really

They loaded two sets of 4 folders of Boats, leafy trees, fllowers, Wild animals into my shape options folder and deprecated or stashed everything else in either a "2019 shapes" folder, or a "Legacy Default Shapes" folder all hidden underneath another "All Legacy Default Shapes" folder.  So I have to drill down that far (see image) to get to things like Arrows.    And under "all legacy default shapes" there is a folder called Nature that was always there which would be a great place for Boats, Flowers, Wild Animals, and Leafy Trees.  Right next to the "LeafLess Trees" folder that was already there.

The best part is in the shapes panels hamburger menu, there is an option for "delete shape"  but it is greyed out and neither deletes a shape nor gives us an option to delete the folder.   The only thing I can do is take all the Flower folders and next them inside each other and then nest that inside Nature, etc.  But then when I need Flowers it's going to be an adventure to go find those under the nested folders!   

Three cheers all around for this mess.  Today I'm going to go look for a Photoshop replacement that doesn't make my Friday's [cursing removed].  Have a good weekend.