Did some refactoring. Changed all names of some classes and made sure they all worked. All good