moving classes to where they should be and working with a library called Rational