Albums disappearing from Photos

I converted from iPhoto to Photos last week and after about 5 days of iCloud upload I thought I was sorted. I used to use Events on iPhoto and it took me a while to get everything converted into Albums.

Today I start up Photos and a number of my Albums have disappeared without warning, and this appears to have transferred to iCloud too.

Simply not good enough. Anyone else had this?