diff --git a/js/building/view/NumberGroupNode.js b/js/building/view/NumberGroupNode.js
index 32adf72..746fea9 100644
--- a/js/building/view/NumberGroupNode.js
+++ b/js/building/view/NumberGroupNode.js
@@ -9,7 +9,7 @@
 import DerivedProperty from '../../../../axon/js/DerivedProperty.js';
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Line } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
diff --git a/js/building/view/ReturnButton.js b/js/building/view/ReturnButton.js
index 613ca7f..db6a854 100644
--- a/js/building/view/ReturnButton.js
+++ b/js/building/view/ReturnButton.js
@@ -6,7 +6,7 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Path } from '../../../../scenery/js/imports.js';
 import RectangularPushButton from '../../../../sun/js/buttons/RectangularPushButton.js';
diff --git a/js/building/view/ShapeGroupNode.js b/js/building/view/ShapeGroupNode.js
index 4f975ed..0a3f678 100644
--- a/js/building/view/ShapeGroupNode.js
+++ b/js/building/view/ShapeGroupNode.js
@@ -12,7 +12,7 @@ import Property from '../../../../axon/js/Property.js';
 import Bounds2 from '../../../../dot/js/Bounds2.js';
 import Matrix3 from '../../../../dot/js/Matrix3.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { HBox } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
diff --git a/js/building/view/ShapeLayerNode.js b/js/building/view/ShapeLayerNode.js
index 878147b..2abc719 100644
--- a/js/building/view/ShapeLayerNode.js
+++ b/js/building/view/ShapeLayerNode.js
@@ -8,7 +8,7 @@
  */
 
 import Utils from '../../../../dot/js/Utils.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import { Circle } from '../../../../scenery/js/imports.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import { Path } from '../../../../scenery/js/imports.js';
diff --git a/js/building/view/ShapePieceNode.js b/js/building/view/ShapePieceNode.js
index 295bae9..b812462 100644
--- a/js/building/view/ShapePieceNode.js
+++ b/js/building/view/ShapePieceNode.js
@@ -8,7 +8,7 @@
 
 import Property from '../../../../axon/js/Property.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { DragListener } from '../../../../scenery/js/imports.js';
 import { Circle } from '../../../../scenery/js/imports.js';
diff --git a/js/common/view/RoundArrowButton.js b/js/common/view/RoundArrowButton.js
index 77a620f..aeb9601 100644
--- a/js/common/view/RoundArrowButton.js
+++ b/js/common/view/RoundArrowButton.js
@@ -7,7 +7,7 @@
  */
 
 import BooleanProperty from '../../../../axon/js/BooleanProperty.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { Path } from '../../../../scenery/js/imports.js';
 import RoundPushButton from '../../../../sun/js/buttons/RoundPushButton.js';
diff --git a/js/game/model/ShapePartition.js b/js/game/model/ShapePartition.js
index b8ceed0..b62afbd 100644
--- a/js/game/model/ShapePartition.js
+++ b/js/game/model/ShapePartition.js
@@ -9,7 +9,7 @@
 
 import Matrix3 from '../../../../dot/js/Matrix3.js';
 import Vector2 from '../../../../dot/js/Vector2.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import fractionsCommon from '../../fractionsCommon.js';
 
 class ShapePartition {
diff --git a/js/intro/view/RoundNumberSpinner.js b/js/intro/view/RoundNumberSpinner.js
index f902720..9516af1 100644
--- a/js/intro/view/RoundNumberSpinner.js
+++ b/js/intro/view/RoundNumberSpinner.js
@@ -8,7 +8,7 @@
 
 import Property from '../../../../axon/js/Property.js';
 import Matrix3 from '../../../../dot/js/Matrix3.js';
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import merge from '../../../../phet-core/js/merge.js';
 import { VBox } from '../../../../scenery/js/imports.js';
 import FractionsCommonColors from '../../common/view/FractionsCommonColors.js';
diff --git a/js/intro/view/beaker/BeakerNode.js b/js/intro/view/beaker/BeakerNode.js
index 2bd56c3..ec487c0 100644
--- a/js/intro/view/beaker/BeakerNode.js
+++ b/js/intro/view/beaker/BeakerNode.js
@@ -6,7 +6,7 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import merge from '../../../../../phet-core/js/merge.js';
 import { Node } from '../../../../../scenery/js/imports.js';
 import { Path } from '../../../../../scenery/js/imports.js';
diff --git a/js/intro/view/cake/CakeContainerNode.js b/js/intro/view/cake/CakeContainerNode.js
index c91872c..a52cb35 100644
--- a/js/intro/view/cake/CakeContainerNode.js
+++ b/js/intro/view/cake/CakeContainerNode.js
@@ -6,7 +6,7 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import { Path } from '../../../../../scenery/js/imports.js';
 import fractionsCommon from '../../../fractionsCommon.js';
 import CellContainerNode from '../CellContainerNode.js';
diff --git a/js/intro/view/cake/CakeNode.js b/js/intro/view/cake/CakeNode.js
index 528a33b..1539727 100644
--- a/js/intro/view/cake/CakeNode.js
+++ b/js/intro/view/cake/CakeNode.js
@@ -11,13 +11,9 @@ import Bounds2 from '../../../../../dot/js/Bounds2.js';
 import Dimension2 from '../../../../../dot/js/Dimension2.js';
 import Ray2 from '../../../../../dot/js/Ray2.js';
 import Vector2 from '../../../../../dot/js/Vector2.js';
-import EllipticalArc from '../../../../../kite/js/segments/EllipticalArc.js';
-import Line from '../../../../../kite/js/segments/Line.js';
-import Shape from '../../../../../kite/js/Shape.js';
+import { EllipticalArc, Line, Shape } from '../../../../../kite/js/imports.js';
 import merge from '../../../../../phet-core/js/merge.js';
-import { Image } from '../../../../../scenery/js/imports.js';
-import { Node } from '../../../../../scenery/js/imports.js';
-import { Path } from '../../../../../scenery/js/imports.js';
+import { Image, Node, Path } from '../../../../../scenery/js/imports.js';
 import cake_1_1_png from '../../../../mipmaps/cake_1_1_png.js';
 import cake_2_1_png from '../../../../mipmaps/cake_2_1_png.js';
 import cake_2_2_png from '../../../../mipmaps/cake_2_2_png.js';
diff --git a/js/intro/view/circular/CircularContainerNode.js b/js/intro/view/circular/CircularContainerNode.js
index f71b604..68c73de 100644
--- a/js/intro/view/circular/CircularContainerNode.js
+++ b/js/intro/view/circular/CircularContainerNode.js
@@ -7,7 +7,7 @@
  */
 
 import Vector2 from '../../../../../dot/js/Vector2.js';
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import { Circle } from '../../../../../scenery/js/imports.js';
 import { Path } from '../../../../../scenery/js/imports.js';
 import FractionsCommonConstants from '../../../common/FractionsCommonConstants.js';
diff --git a/js/intro/view/circular/CircularNode.js b/js/intro/view/circular/CircularNode.js
index 01352e0..c3d5fda 100644
--- a/js/intro/view/circular/CircularNode.js
+++ b/js/intro/view/circular/CircularNode.js
@@ -7,7 +7,7 @@
  */
 
 import Vector2 from '../../../../../dot/js/Vector2.js';
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import merge from '../../../../../phet-core/js/merge.js';
 import { Node } from '../../../../../scenery/js/imports.js';
 import { Path } from '../../../../../scenery/js/imports.js';
diff --git a/js/intro/view/numberline/NumberLineNode.js b/js/intro/view/numberline/NumberLineNode.js
index 4d9d9fc..485b955 100644
--- a/js/intro/view/numberline/NumberLineNode.js
+++ b/js/intro/view/numberline/NumberLineNode.js
@@ -10,7 +10,7 @@ import NumberProperty from '../../../../../axon/js/NumberProperty.js';
 import Property from '../../../../../axon/js/Property.js';
 import Bounds2 from '../../../../../dot/js/Bounds2.js';
 import Utils from '../../../../../dot/js/Utils.js';
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import merge from '../../../../../phet-core/js/merge.js';
 import ArrowNode from '../../../../../scenery-phet/js/ArrowNode.js';
 import PhetFont from '../../../../../scenery-phet/js/PhetFont.js';
diff --git a/js/intro/view/numberline/NumberLineSceneNode.js b/js/intro/view/numberline/NumberLineSceneNode.js
index 9edc03a..3ae1b60 100644
--- a/js/intro/view/numberline/NumberLineSceneNode.js
+++ b/js/intro/view/numberline/NumberLineSceneNode.js
@@ -8,7 +8,7 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import PhetFont from '../../../../../scenery-phet/js/PhetFont.js';
 import { Node } from '../../../../../scenery/js/imports.js';
 import { Path } from '../../../../../scenery/js/imports.js';
diff --git a/js/intro/view/rectangular/RectangularContainerNode.js b/js/intro/view/rectangular/RectangularContainerNode.js
index 9a7da0a..aa9a220 100644
--- a/js/intro/view/rectangular/RectangularContainerNode.js
+++ b/js/intro/view/rectangular/RectangularContainerNode.js
@@ -7,7 +7,7 @@
  */
 
 import Bounds2 from '../../../../../dot/js/Bounds2.js';
-import Shape from '../../../../../kite/js/Shape.js';
+import { Shape } from '../../../../../kite/js/imports.js';
 import merge from '../../../../../phet-core/js/merge.js';
 import { Path } from '../../../../../scenery/js/imports.js';
 import { Rectangle } from '../../../../../scenery/js/imports.js';
diff --git a/js/matching/view/MatchChartNode.js b/js/matching/view/MatchChartNode.js
index 89bae17..010e1e0 100644
--- a/js/matching/view/MatchChartNode.js
+++ b/js/matching/view/MatchChartNode.js
@@ -8,7 +8,7 @@
  * @author Jonathan Olson <jonathan.olson@colorado.edu>
  */
 
-import Shape from '../../../../kite/js/Shape.js';
+import { Shape } from '../../../../kite/js/imports.js';
 import PhetFont from '../../../../scenery-phet/js/PhetFont.js';
 import { Node } from '../../../../scenery/js/imports.js';
 import { Path } from '../../../../scenery/js/imports.js';