Starting to move category classes to their own module