A bit of renaming. Decided to add Controller, Repository, Interface etc to the class names to make it a bit easier.