Issue #2 removed converted template classes.
Issue #2 WIP