Issue #66 - folder names are not respected in non-direct uploads
Issue #65 Allow overwriting existing images whn updating preloaded images