Cleanup of Enumerator components

Moved enumerator specific conversion functions to own files.