NR-819 : Advanced file upload

a bit of decoupling