Adjust the uploads directory
Fixed merge