Split out classes not directly related to the model