more refactoring to fix build issues -- this should be all the inner classes referenced by mocks