Deduplication

Moved identical classes to base-module.