Modified the location of uploaded files
Fixed conflicts