My preference would be to remove the backwards compatibility and just store the combined path. That will also make the UI quite a bit cleaner.

@mrvisser @simong : There's no need to write a migration script for this right? We just have to remember to reprocess the previews?