Yeah I believe calibre can pull the files from the kindle as well as push to it. But I've only got an old kindle not a new one.