db model reorganization