mtecs: small cleanup, move subclass to own file