Reorganized mixins to match API package structure.