I currently have about a 150 GB photo library stored on disk in a file structure such as: Pictures 2001 Christmas Thanksgiving Beach Vacation That Race I Did 2002 Christmas Thanksgiving Disney Trip 2003 You get the picture They may go one more level deeper for certain events, but not much deeper than that. I'm considering moving everything to iCloud Photo Library but my OCD is making it hard to give up the folder structure. My impression of iCloud Photo Library is that it is one huge container in which every single one of my photos goes. If I want any type of structure, I then create Albums and photos can live within multiple Albums if desired (not desired btw). Does anyone have any hints/tips/assurances that can help me embrace going whole-hog with iCloud Photo Library?