Tweak uploads folder structure ref#5275
Derivatives now live in the same folder as the master digital objects.