Oh wow you sound like Uncle Bob (and I say that as a compliment).<p>I think you&#x27;re right. There is a lot of room for refactoring here. A few more (business&#x2F;model) classes would not hurt here.