Renamed classes for shorter names.
Fixed tests.
Dropped unnecessary interfaces.