Move rest of types, Add rethinkdb database adapter