Cleanup and rename the database namespace

- Stop calling (db/db) in models