Continued refactoring.

Further simplified classes.