diff --git a/es-modules/mixins/CenteredSeries.js b/es-modules/mixin/CenteredSeries.js
similarity index 100%
rename from es-modules/mixins/CenteredSeries.js
rename to es-modules/mixin/CenteredSeries.js
diff --git a/es-modules/mixins/ColorMapSeries.js b/es-modules/mixin/ColorMapSeries.js
similarity index 100%
rename from es-modules/mixins/ColorMapSeries.js
rename to es-modules/mixin/ColorMapSeries.js
diff --git a/es-modules/mixins/ColorSeries.js b/es-modules/mixin/ColorSeries.js
similarity index 100%
rename from es-modules/mixins/ColorSeries.js
rename to es-modules/mixin/ColorSeries.js
diff --git a/es-modules/mixins/DerivedSeries.js b/es-modules/mixin/DerivedSeries.js
similarity index 100%
rename from es-modules/mixins/DerivedSeries.js
rename to es-modules/mixin/DerivedSeries.js
diff --git a/es-modules/mixins/DrawPoint.js b/es-modules/mixin/DrawPoint.js
similarity index 100%
rename from es-modules/mixins/DrawPoint.js
rename to es-modules/mixin/DrawPoint.js
diff --git a/es-modules/mixins/GeometryCircles.js b/es-modules/mixin/GeometryCircles.js
similarity index 100%
rename from es-modules/mixins/GeometryCircles.js
rename to es-modules/mixin/GeometryCircles.js
diff --git a/es-modules/mixins/IndicatorRequired.js b/es-modules/mixin/IndicatorRequired.js
similarity index 100%
rename from es-modules/mixins/IndicatorRequired.js
rename to es-modules/mixin/IndicatorRequired.js
diff --git a/es-modules/mixins/LegendSymbol.js b/es-modules/mixin/LegendSymbol.js
similarity index 100%
rename from es-modules/mixins/LegendSymbol.js
rename to es-modules/mixin/LegendSymbol.js
diff --git a/es-modules/mixins/MultipleLines.js b/es-modules/mixin/MultipleLines.js
similarity index 100%
rename from es-modules/mixins/MultipleLines.js
rename to es-modules/mixin/MultipleLines.js
diff --git a/es-modules/mixins/NelderMead.js b/es-modules/mixin/NelderMead.js
similarity index 100%
rename from es-modules/mixins/NelderMead.js
rename to es-modules/mixin/NelderMead.js
diff --git a/es-modules/mixins/OnSeries.js b/es-modules/mixin/OnSeries.js
similarity index 100%
rename from es-modules/mixins/OnSeries.js
rename to es-modules/mixin/OnSeries.js
diff --git a/es-modules/mixins/ReduceArray.js b/es-modules/mixin/ReduceArray.js
similarity index 100%
rename from es-modules/mixins/ReduceArray.js
rename to es-modules/mixin/ReduceArray.js
diff --git a/es-modules/mixins/TreeSeries.js b/es-modules/mixin/TreeSeries.js
similarity index 100%
rename from es-modules/mixins/TreeSeries.js
rename to es-modules/mixin/TreeSeries.js
diff --git a/es-modules/mixins/geometry.js b/es-modules/mixin/geometry.js
similarity index 100%
rename from es-modules/mixins/geometry.js
rename to es-modules/mixin/geometry.js
diff --git a/es-modules/mixins/navigation.js b/es-modules/mixin/navigation.js
similarity index 100%
rename from es-modules/mixins/navigation.js
rename to es-modules/mixin/navigation.js
diff --git a/es-modules/mixins/nodes.js b/es-modules/mixin/nodes.js
similarity index 100%
rename from es-modules/mixins/nodes.js
rename to es-modules/mixin/nodes.js
diff --git a/es-modules/mixins/polygon.js b/es-modules/mixin/polygon.js
similarity index 100%
rename from es-modules/mixins/polygon.js
rename to es-modules/mixin/polygon.js