diff --git a/modules/aggregation-layers/src/common/aggregation-layer.ts b/modules/aggregation-layers/src/common/aggregation-layer.ts
index 7003d1f3361..3ee15233670 100644
--- a/modules/aggregation-layers/src/common/aggregation-layer.ts
+++ b/modules/aggregation-layers/src/common/aggregation-layer.ts
@@ -7,7 +7,7 @@ import {
   Attribute,
   AttributeManager
 } from '@deck.gl/core';
-import {Aggregator} from './aggregator';
+import {Aggregator} from './aggregator/aggregator';
 
 export type AggregationLayerProps<DataT> = CompositeLayerProps & {
   data: LayerDataSource<DataT>;
diff --git a/modules/aggregation-layers/src/common/aggregator.ts b/modules/aggregation-layers/src/common/aggregator/aggregator.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/aggregator.ts
rename to modules/aggregation-layers/src/common/aggregator/aggregator.ts
diff --git a/modules/aggregation-layers/src/common/cpu-aggregator/aggregate.ts b/modules/aggregation-layers/src/common/aggregator/cpu-aggregator/aggregate.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/cpu-aggregator/aggregate.ts
rename to modules/aggregation-layers/src/common/aggregator/cpu-aggregator/aggregate.ts
diff --git a/modules/aggregation-layers/src/common/cpu-aggregator/cpu-aggregator.ts b/modules/aggregation-layers/src/common/aggregator/cpu-aggregator/cpu-aggregator.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/cpu-aggregator/cpu-aggregator.ts
rename to modules/aggregation-layers/src/common/aggregator/cpu-aggregator/cpu-aggregator.ts
diff --git a/modules/aggregation-layers/src/common/cpu-aggregator/sort-bins.ts b/modules/aggregation-layers/src/common/aggregator/cpu-aggregator/sort-bins.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/cpu-aggregator/sort-bins.ts
rename to modules/aggregation-layers/src/common/aggregator/cpu-aggregator/sort-bins.ts
diff --git a/modules/aggregation-layers/src/common/cpu-aggregator/vertex-accessor.ts b/modules/aggregation-layers/src/common/aggregator/cpu-aggregator/vertex-accessor.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/cpu-aggregator/vertex-accessor.ts
rename to modules/aggregation-layers/src/common/aggregator/cpu-aggregator/vertex-accessor.ts
diff --git a/modules/aggregation-layers/src/common/gpu-aggregator/utils.ts b/modules/aggregation-layers/src/common/aggregator/gpu-aggregator/utils.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/gpu-aggregator/utils.ts
rename to modules/aggregation-layers/src/common/aggregator/gpu-aggregator/utils.ts
diff --git a/modules/aggregation-layers/src/common/gpu-aggregator/webgl-aggregation-transform.ts b/modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-aggregation-transform.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/gpu-aggregator/webgl-aggregation-transform.ts
rename to modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-aggregation-transform.ts
diff --git a/modules/aggregation-layers/src/common/gpu-aggregator/webgl-aggregator.ts b/modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-aggregator.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/gpu-aggregator/webgl-aggregator.ts
rename to modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-aggregator.ts
diff --git a/modules/aggregation-layers/src/common/gpu-aggregator/webgl-bin-sorter.ts b/modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-bin-sorter.ts
similarity index 100%
rename from modules/aggregation-layers/src/common/gpu-aggregator/webgl-bin-sorter.ts
rename to modules/aggregation-layers/src/common/aggregator/gpu-aggregator/webgl-bin-sorter.ts
diff --git a/modules/aggregation-layers/src/common/aggregator/index.ts b/modules/aggregation-layers/src/common/aggregator/index.ts
new file mode 100644
index 00000000000..2a0553c6cfa
--- /dev/null
+++ b/modules/aggregation-layers/src/common/aggregator/index.ts
@@ -0,0 +1,6 @@
+export {CPUAggregator} from './cpu-aggregator/cpu-aggregator';
+export {WebGLAggregator} from './gpu-aggregator/webgl-aggregator';
+
+export type {Aggregator, AggregatedBin, AggregationOperation, AggregationProps} from './aggregator';
+export type {CPUAggregatorProps} from './cpu-aggregator/cpu-aggregator';
+export type {WebGLAggregatorProps} from './gpu-aggregator/webgl-aggregator';
diff --git a/modules/aggregation-layers/src/types.ts b/modules/aggregation-layers/src/common/types.ts
similarity index 100%
rename from modules/aggregation-layers/src/types.ts
rename to modules/aggregation-layers/src/common/types.ts
diff --git a/modules/aggregation-layers/src/utils/color-utils.ts b/modules/aggregation-layers/src/common/utils/color-utils.ts
similarity index 100%
rename from modules/aggregation-layers/src/utils/color-utils.ts
rename to modules/aggregation-layers/src/common/utils/color-utils.ts
diff --git a/modules/aggregation-layers/src/utils/prop-utils.ts b/modules/aggregation-layers/src/common/utils/prop-utils.ts
similarity index 100%
rename from modules/aggregation-layers/src/utils/prop-utils.ts
rename to modules/aggregation-layers/src/common/utils/prop-utils.ts
diff --git a/modules/aggregation-layers/src/utils/scale-utils.js b/modules/aggregation-layers/src/common/utils/scale-utils.js
similarity index 100%
rename from modules/aggregation-layers/src/utils/scale-utils.js
rename to modules/aggregation-layers/src/common/utils/scale-utils.js
diff --git a/modules/aggregation-layers/src/contour-layer/contour-layer.ts b/modules/aggregation-layers/src/contour-layer/contour-layer.ts
index 90df41a87c7..1921dee93f3 100644
--- a/modules/aggregation-layers/src/contour-layer/contour-layer.ts
+++ b/modules/aggregation-layers/src/contour-layer/contour-layer.ts
@@ -16,11 +16,9 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {PathLayer, SolidPolygonLayer} from '@deck.gl/layers';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
 import {AggregationLayerProps} from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
 import {generateContours, Contour, ContourLine, ContourPolygon} from './contour-utils';
 import {getAggregatorValueReader} from './value-reader';
 import {Matrix4} from '@math.gl/core';
diff --git a/modules/aggregation-layers/src/contour-layer/value-reader.ts b/modules/aggregation-layers/src/contour-layer/value-reader.ts
index 3f4ec6388c3..cb402514052 100644
--- a/modules/aggregation-layers/src/contour-layer/value-reader.ts
+++ b/modules/aggregation-layers/src/contour-layer/value-reader.ts
@@ -1,6 +1,4 @@
-import {Aggregator} from '../common/aggregator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {Aggregator, CPUAggregator, WebGLAggregator} from '../common/aggregator/index';
 import type {TypedArray} from '@luma.gl/core';
 
 type ValueReader = (x: number, y: number) => number;
diff --git a/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts b/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts
index 36d51355323..db3a10ebec0 100644
--- a/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts
+++ b/modules/aggregation-layers/src/grid-layer/grid-cell-layer.ts
@@ -6,7 +6,7 @@ import {Texture} from '@luma.gl/core';
 import {UpdateParameters, Color} from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
 import {CubeGeometry} from '@luma.gl/engine';
-import {colorRangeToTexture} from '../utils/color-utils';
+import {colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './grid-cell-layer-vertex.glsl';
 
 /** Proprties added by GridCellLayer. */
diff --git a/modules/aggregation-layers/src/grid-layer/grid-layer.ts b/modules/aggregation-layers/src/grid-layer/grid-layer.ts
index 40c93013ecc..f4e9d13b7e4 100644
--- a/modules/aggregation-layers/src/grid-layer/grid-layer.ts
+++ b/modules/aggregation-layers/src/grid-layer/grid-layer.ts
@@ -19,12 +19,10 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {getDistanceScales} from '@math.gl/web-mercator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
-import {AggregateAccessor} from '../types';
-import {defaultColorRange} from '../utils/color-utils';
+import {AggregateAccessor} from '../common/types';
+import {defaultColorRange} from '../common/utils/color-utils';
 
 import {GridCellLayer} from './grid-cell-layer';
 
diff --git a/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts b/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts
index 347e14ee4c9..310a48e1fd5 100644
--- a/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts
+++ b/modules/aggregation-layers/src/heatmap-layer/aggregation-layer.ts
@@ -27,7 +27,7 @@ import {
   CompositeLayerProps,
   Attribute
 } from '@deck.gl/core';
-import {filterProps} from '../utils/prop-utils';
+import {filterProps} from '../common/utils/prop-utils';
 
 export type AggregationLayerProps<DataT> = CompositeLayerProps & {
   data: LayerDataSource<DataT>;
diff --git a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
index 5ab02aa0a19..ebe6b9a5c52 100644
--- a/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
+++ b/modules/aggregation-layers/src/heatmap-layer/heatmap-layer.ts
@@ -46,7 +46,7 @@ import {
 } from '@deck.gl/core';
 import TriangleLayer from './triangle-layer';
 import AggregationLayer, {AggregationLayerProps} from './aggregation-layer';
-import {defaultColorRange, colorRangeToFlatArray} from '../utils/color-utils';
+import {defaultColorRange, colorRangeToFlatArray} from '../common/utils/color-utils';
 import weightsVs from './weights-vs.glsl';
 import weightsFs from './weights-fs.glsl';
 import maxVs from './max-vs.glsl';
diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts
index 3273d567ba8..a5c34630bf0 100644
--- a/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts
+++ b/modules/aggregation-layers/src/hexagon-layer/hexagon-cell-layer.ts
@@ -5,7 +5,7 @@
 import {Texture} from '@luma.gl/core';
 import {UpdateParameters, Color} from '@deck.gl/core';
 import {ColumnLayer} from '@deck.gl/layers';
-import {colorRangeToTexture} from '../utils/color-utils';
+import {colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './hexagon-cell-layer-vertex.glsl';
 
 /** Proprties added by HexagonCellLayer. */
diff --git a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
index ef0b2353697..5d936ce7c29 100644
--- a/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
+++ b/modules/aggregation-layers/src/hexagon-layer/hexagon-layer.ts
@@ -19,12 +19,10 @@ import {
   DefaultProps
 } from '@deck.gl/core';
 import {getDistanceScales} from '@math.gl/web-mercator';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
-import {AggregateAccessor} from '../types';
-import {defaultColorRange} from '../utils/color-utils';
+import {AggregateAccessor} from '../common/types';
+import {defaultColorRange} from '../common/utils/color-utils';
 
 import HexagonCellLayer from './hexagon-cell-layer';
 import {pointToHexbin, HexbinVertices, getHexbinCentroid, pointToHexbinGLSL} from './hexbin';
diff --git a/modules/aggregation-layers/src/index.ts b/modules/aggregation-layers/src/index.ts
index dd71c630d8f..1f8cec9d74b 100644
--- a/modules/aggregation-layers/src/index.ts
+++ b/modules/aggregation-layers/src/index.ts
@@ -25,8 +25,7 @@ export {default as GridLayer} from './grid-layer/grid-layer';
 export {default as HeatmapLayer} from './heatmap-layer/heatmap-layer';
 
 export {default as _AggregationLayer} from './common/aggregation-layer';
-export {WebGLAggregator} from './common/gpu-aggregator/webgl-aggregator';
-export {CPUAggregator} from './common/cpu-aggregator/cpu-aggregator';
+export {WebGLAggregator, CPUAggregator} from './common/aggregator/index';
 
 // types
 export type {ContourLayerProps, ContourLayerPickingInfo} from './contour-layer/contour-layer';
@@ -38,6 +37,10 @@ export type {
   ScreenGridLayerPickingInfo
 } from './screen-grid-layer/screen-grid-layer';
 
-export type {Aggregator, AggregationOperation, AggregationProps} from './common/aggregator';
-export type {WebGLAggregatorProps} from './common/gpu-aggregator/webgl-aggregator';
-export type {CPUAggregatorProps} from './common/cpu-aggregator/cpu-aggregator';
+export type {
+  Aggregator,
+  AggregationOperation,
+  AggregationProps,
+  WebGLAggregatorProps,
+  CPUAggregatorProps
+} from './common/aggregator/index';
diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
index 4c302c19723..e5c8394c9a2 100644
--- a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
+++ b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-cell-layer.ts
@@ -21,7 +21,7 @@
 import {Texture} from '@luma.gl/core';
 import {Model, Geometry} from '@luma.gl/engine';
 import {Layer, picking, UpdateParameters, DefaultProps, Color} from '@deck.gl/core';
-import {defaultColorRange, colorRangeToTexture} from '../utils/color-utils';
+import {defaultColorRange, colorRangeToTexture} from '../common/utils/color-utils';
 import vs from './screen-grid-layer-vertex.glsl';
 import fs from './screen-grid-layer-fragment.glsl';
 import {ShaderModule} from '@luma.gl/shadertools';
diff --git a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
index 8222e0a8554..547639f6aa4 100644
--- a/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
+++ b/modules/aggregation-layers/src/screen-grid-layer/screen-grid-layer.ts
@@ -31,10 +31,8 @@ import {
   UpdateParameters,
   DefaultProps
 } from '@deck.gl/core';
-import {WebGLAggregator} from '../common/gpu-aggregator/webgl-aggregator';
-import {CPUAggregator} from '../common/cpu-aggregator/cpu-aggregator';
+import {WebGLAggregator, CPUAggregator, AggregationOperation} from '../common/aggregator/index';
 import AggregationLayer from '../common/aggregation-layer';
-import {AggregationOperation} from '../common/aggregator';
 import ScreenGridCellLayer from './screen-grid-cell-layer';
 
 const defaultProps: DefaultProps<ScreenGridLayerProps> = {
diff --git a/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts b/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts
index a2997d939b4..c690898c0e3 100644
--- a/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts
+++ b/test/modules/aggregation-layers/common/cpu-aggregator/vertex-accessor.spec.ts
@@ -3,7 +3,7 @@ import {Attribute} from '@deck.gl/core';
 import {
   VertexAccessor,
   evaluateVertexAccessor
-} from '@deck.gl/aggregation-layers/common/cpu-aggregator/vertex-accessor';
+} from '@deck.gl/aggregation-layers/common/aggregator/cpu-aggregator/vertex-accessor';
 import {device} from '@deck.gl/test-utils';
 
 test('evaluateVertexAccessor#sources', t => {
diff --git a/test/modules/aggregation-layers/utils/color-utils.spec.ts b/test/modules/aggregation-layers/common/utils/color-utils.spec.ts
similarity index 97%
rename from test/modules/aggregation-layers/utils/color-utils.spec.ts
rename to test/modules/aggregation-layers/common/utils/color-utils.spec.ts
index 12121dbd146..95d7911699b 100644
--- a/test/modules/aggregation-layers/utils/color-utils.spec.ts
+++ b/test/modules/aggregation-layers/common/utils/color-utils.spec.ts
@@ -1,5 +1,5 @@
 import test from 'tape-promise/tape';
-import {colorRangeToFlatArray} from '@deck.gl/aggregation-layers/utils/color-utils';
+import {colorRangeToFlatArray} from '@deck.gl/aggregation-layers/common/utils/color-utils';
 
 test('color-utils#colorRangeToFlatArray', t => {
   const TESTS = [
diff --git a/test/modules/aggregation-layers/utils/scale-utils.spec.ts b/test/modules/aggregation-layers/common/utils/scale-utils.spec.ts
similarity index 98%
rename from test/modules/aggregation-layers/utils/scale-utils.spec.ts
rename to test/modules/aggregation-layers/common/utils/scale-utils.spec.ts
index 24b7d754d85..4294af1efda 100644
--- a/test/modules/aggregation-layers/utils/scale-utils.spec.ts
+++ b/test/modules/aggregation-layers/common/utils/scale-utils.spec.ts
@@ -4,7 +4,7 @@ import {
   getQuantileScale,
   getOrdinalScale,
   getLinearScale
-} from '@deck.gl/aggregation-layers/utils/scale-utils';
+} from '@deck.gl/aggregation-layers/common/utils/scale-utils';
 
 const RANGE = [100, 200, 300, 400, 500, 600, 700, 800, 900, 1000];
 const LINEAR_SCALE_TEST_CASES = [
diff --git a/test/modules/aggregation-layers/index.ts b/test/modules/aggregation-layers/index.ts
index 437bdd891db..1bbd7be5d81 100644
--- a/test/modules/aggregation-layers/index.ts
+++ b/test/modules/aggregation-layers/index.ts
@@ -27,9 +27,8 @@ import './hexagon-layer.spec';
 import './hexbin.spec';
 import './screen-grid-layer.spec';
 import './screengrid-cell-layer.spec';
-import './utils/color-utils.spec';
-import './utils/scale-utils.spec';
-
+import './common/utils/color-utils.spec';
+import './common/utils/scale-utils.spec';
 import './common/webgl-aggregator.spec';
 import './common/cpu-aggregator/cpu-aggregator.spec';
 import './common/cpu-aggregator/vertex-accessor.spec';