update mixins to new kind format and add them to the package fie for testing