Folders with Albums have disappeared

I am in the process of transitioning from using Lightroom to using iCloud Photo Library. Instead of doing a big bang transition I'm doing it a little at a time. Another reason I'm doing it this way is because I'm setting up a folder/album structure similar to my folder structure in Lightroom. Yesterday when I opened up the Photos app on my iPhone 6 I noticed that my folders and albums were gone. It doesn't look like the photos are gone but the folder/album structure is gone. Basically, I have one parent folder at the top and then subfolders for each year. For each year I have a combination of other subfolders and albums. The top level parent folder is missing which means I can't get to all of my other custom folders/albums.

I then went to the Photos App on my Mac Mini and my MacBook Pro and the same thing ... no custom folders/albums. The strange thing is that when I go to www.icloud.com all of the custom albums seem to be there (although not in any hierarchy). So it doesn't look like they are truly gone but they are not showing up in any of the Photos apps.

I was hesitant to move my photos to a web based service and this fuels my concern even more. However, I want to pursue resolving the issue since none of my photos have seemed to disappeared.

Thanks,

John Dupre Jr