Doing some reorganization

Moving our abstract models into a `util` folder.