Feature/file uploads without move