Home Screen App Organization Vanished

I had all my apps organized into folders on the Home Screen. I had one empty screen and the dot to the right had all my folders. The image shows how things looked about 3 weeks ago.

Sometime in the last week or two all of my apps vanished into the somewhat unattractive and inefficiently auto-organized App Library. It now takes significantly longer to find what I am looking for

Is there a setting I tripped that I can undo that will again display my folder structure? 

If not, does anyone have any ides on how to restore them without the incredibly time consuming process of one by one dragging them all from the App Library back to the desktop and reorganizing them? Even just pulling them out of the library making a gi-hugic mess that I can then sort into folders would be helpful.

thank you