Move base class and subclasses into a 'base' module.

This isn't perfect, but it should be a safe change...
more to come.

Change-Id: I81db39b163533530f0b5b19945ca9cf54c596400