Extract a Definition class

We had methods that both took a definition so let's just
create something that represents that in our system