Merged the OodbDatabase interfaces into one file.. that's it