[kovidgoyal]

Create a new calibre library. Switch to it. Then right click the add books button and choose add from folders and sub-folders and then yes to assume all files in a folder are a single book and ten choose the old library location.