Cleaning up

Removing unnecessary interfaces, and renaming classes to more
descriptive names.