Change filename and refactor upload routes