Move mixin to cl-new
Move mixin to cl-new