Merging
Dropzone now drops into folders without children, move function fixed from prep function break