Improved Mixin organization, updated tests and examples.

Small reorganization for how mixins are handled.