Move the base classes to their own module