Change to use file suffixing on DB names as opposed to folder structure