diff --git a/__tests__/applyAtRule.test.js b/__tests__/applyAtRule.test.js
index 4c415714b..a6f149457 100644
--- a/__tests__/applyAtRule.test.js
+++ b/__tests__/applyAtRule.test.js
@@ -1,6 +1,6 @@
 import postcss from 'postcss'
 import plugin from '../src/lib/substituteClassApplyAtRules'
-import generateUtilities from '../src/util/generateUtilities'
+import generateUtilities from '../src/legacy/generateUtilities'
 import defaultConfig from '../defaultConfig.stub.js'
 
 const defaultUtilities = generateUtilities(defaultConfig, [])
diff --git a/src/defaultPlugins.js b/src/defaultPlugins.js
new file mode 100644
index 000000000..0c41ae586
--- /dev/null
+++ b/src/defaultPlugins.js
@@ -0,0 +1,103 @@
+// import lists from './generators/lists'
+// import appearance from './generators/appearance'
+// import backgroundAttachment from './generators/backgroundAttachment'
+// import backgroundColors from './generators/backgroundColors'
+// import backgroundPosition from './generators/backgroundPosition'
+// import backgroundRepeat from './generators/backgroundRepeat'
+// import backgroundSize from './generators/backgroundSize'
+// import borderCollapse from './generators/borderCollapse'
+// import borderColors from './generators/borderColors'
+// import borderRadius from './generators/borderRadius'
+// import borderStyle from './generators/borderStyle'
+// import borderWidths from './generators/borderWidths'
+// import cursor from './generators/cursor'
+// import display from './generators/display'
+// import flexbox from './generators/flexbox'
+// import float from './generators/float'
+// import fonts from './generators/fonts'
+// import fontWeights from './generators/fontWeights'
+// import height from './generators/height'
+// import leading from './generators/leading'
+// import margin from './generators/margin'
+// import maxHeight from './generators/maxHeight'
+// import maxWidth from './generators/maxWidth'
+// import minHeight from './generators/minHeight'
+// import minWidth from './generators/minWidth'
+// import negativeMargin from './generators/negativeMargin'
+// import objectFit from './generators/objectFit'
+// import objectPosition from './generators/objectPosition'
+// import opacity from './generators/opacity'
+// import outline from './generators/outline'
+// import overflow from './generators/overflow'
+// import padding from './generators/padding'
+// import pointerEvents from './generators/pointerEvents'
+// import position from './generators/position'
+// import resize from './generators/resize'
+// import shadows from './generators/shadows'
+// import svgFill from './generators/svgFill'
+// import svgStroke from './generators/svgStroke'
+// import tableLayout from './generators/tableLayout'
+// import textAlign from './generators/textAlign'
+// import textColors from './generators/textColors'
+// import textSizes from './generators/textSizes'
+// import textStyle from './generators/textStyle'
+// import tracking from './generators/tracking'
+// import userSelect from './generators/userSelect'
+// import verticalAlign from './generators/verticalAlign'
+// import visibility from './generators/visibility'
+// import whitespace from './generators/whitespace'
+// import width from './generators/width'
+import zIndex from './plugins/zIndex'
+
+export default [
+  // { name: 'lists', generator: lists },
+  // { name: 'appearance', generator: appearance },
+  // { name: 'backgroundAttachment', generator: backgroundAttachment },
+  // { name: 'backgroundColors', generator: backgroundColors },
+  // { name: 'backgroundPosition', generator: backgroundPosition },
+  // { name: 'backgroundRepeat', generator: backgroundRepeat },
+  // { name: 'backgroundSize', generator: backgroundSize },
+  // { name: 'borderCollapse', generator: borderCollapse },
+  // { name: 'borderColors', generator: borderColors },
+  // { name: 'borderRadius', generator: borderRadius },
+  // { name: 'borderStyle', generator: borderStyle },
+  // { name: 'borderWidths', generator: borderWidths },
+  // { name: 'cursor', generator: cursor },
+  // { name: 'display', generator: display },
+  // { name: 'flexbox', generator: flexbox },
+  // { name: 'float', generator: float },
+  // { name: 'fonts', generator: fonts },
+  // { name: 'fontWeights', generator: fontWeights },
+  // { name: 'height', generator: height },
+  // { name: 'leading', generator: leading },
+  // { name: 'margin', generator: margin },
+  // { name: 'maxHeight', generator: maxHeight },
+  // { name: 'maxWidth', generator: maxWidth },
+  // { name: 'minHeight', generator: minHeight },
+  // { name: 'minWidth', generator: minWidth },
+  // { name: 'negativeMargin', generator: negativeMargin },
+  // { name: 'objectFit', generator: objectFit },
+  // { name: 'objectPosition', generator: objectPosition },
+  // { name: 'opacity', generator: opacity },
+  // { name: 'outline', generator: outline },
+  // { name: 'overflow', generator: overflow },
+  // { name: 'padding', generator: padding },
+  // { name: 'pointerEvents', generator: pointerEvents },
+  // { name: 'position', generator: position },
+  // { name: 'resize', generator: resize },
+  // { name: 'shadows', generator: shadows },
+  // { name: 'svgFill', generator: svgFill },
+  // { name: 'svgStroke', generator: svgStroke },
+  // { name: 'tableLayout', generator: tableLayout },
+  // { name: 'textAlign', generator: textAlign },
+  // { name: 'textColors', generator: textColors },
+  // { name: 'textSizes', generator: textSizes },
+  // { name: 'textStyle', generator: textStyle },
+  // { name: 'tracking', generator: tracking },
+  // { name: 'userSelect', generator: userSelect },
+  // { name: 'verticalAlign', generator: verticalAlign },
+  // { name: 'visibility', generator: visibility },
+  // { name: 'whitespace', generator: whitespace },
+  // { name: 'width', generator: width },
+  zIndex,
+]
diff --git a/src/util/generateUtilities.js b/src/legacy/generateUtilities.js
similarity index 100%
rename from src/util/generateUtilities.js
rename to src/legacy/generateUtilities.js
diff --git a/src/plugins/zIndex.js b/src/plugins/zIndex.js
new file mode 100644
index 000000000..68b08991f
--- /dev/null
+++ b/src/plugins/zIndex.js
@@ -0,0 +1,13 @@
+import _ from 'lodash'
+
+export default function () {
+  return function ({ addUtilities, config }) {
+    const utilities = _.fromPairs(_.map(config('zIndex'), (value, modifier) => {
+      return [`.z-${modifier}`, {
+        'z-index': value,
+      }]
+    }))
+
+    addUtilities(utilities, config('modules.zIndex'))
+  }
+}
diff --git a/src/processTailwindFeatures.js b/src/processTailwindFeatures.js
index 73dceaa39..cbc69ad97 100644
--- a/src/processTailwindFeatures.js
+++ b/src/processTailwindFeatures.js
@@ -8,13 +8,18 @@ import substituteResponsiveAtRules from './lib/substituteResponsiveAtRules'
 import substituteScreenAtRules from './lib/substituteScreenAtRules'
 import substituteClassApplyAtRules from './lib/substituteClassApplyAtRules'
 
-import generateUtilities from './util/generateUtilities'
+import generateUtilities from './legacy/generateUtilities'
 import processPlugins from './util/processPlugins'
 
+import defaultPlugins from './defaultPlugins'
+
 export default function(getConfig) {
   return function(css) {
     const config = getConfig()
-    const processedPlugins = processPlugins(config.plugins, config)
+    const processedPlugins = processPlugins([
+      ...defaultPlugins.map(plugin => plugin()),
+      ...config.plugins
+    ], config)
     const utilities = generateUtilities(config, processedPlugins.utilities)
 
     return postcss([
diff --git a/src/utilityModules.js b/src/utilityModules.js
index 01f37dce3..67134eb5f 100644
--- a/src/utilityModules.js
+++ b/src/utilityModules.js
@@ -99,5 +99,5 @@ export default [
   { name: 'visibility', generator: visibility },
   { name: 'whitespace', generator: whitespace },
   { name: 'width', generator: width },
-  { name: 'zIndex', generator: zIndex },
+  // { name: 'zIndex', generator: zIndex },
 ]