Feature Request: Migrate Folders and Keywords from Classic

As the title says, for me to really properly migrate from Classic to CC I would need support for migrating keywords and folder structures as albums.