diff --git a/js/ArrowNode.js b/js/ArrowNode.js
index 80b1a8d45..40b73fe46 100644
--- a/js/ArrowNode.js
+++ b/js/ArrowNode.js
@@ -9,7 +9,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Path } from '../../scenery/js/imports.js';
diff --git a/js/ArrowShape.js b/js/ArrowShape.js
index 99dfc05a8..c8b438481 100644
--- a/js/ArrowShape.js
+++ b/js/ArrowShape.js
@@ -12,7 +12,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 sceneryPhet from './sceneryPhet.js';
 
diff --git a/js/BackspaceIcon.js b/js/BackspaceIcon.js
index ac6af3483..3d1f63b4b 100644
--- a/js/BackspaceIcon.js
+++ b/js/BackspaceIcon.js
@@ -9,7 +9,7 @@
  */
 
 import Dimension2 from '../../dot/js/Dimension2.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 sceneryPhet from './sceneryPhet.js';
diff --git a/js/BicyclePumpNode.js b/js/BicyclePumpNode.js
index 29360d915..a4e7b64fc 100644
--- a/js/BicyclePumpNode.js
+++ b/js/BicyclePumpNode.js
@@ -12,7 +12,7 @@
 import BooleanProperty from '../../axon/js/BooleanProperty.js';
 import Utils from '../../dot/js/Utils.js';
 import Vector2 from '../../dot/js/Vector2.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { DragListener } from '../../scenery/js/imports.js';
diff --git a/js/BracketNode.js b/js/BracketNode.js
index 5fbd755b1..65a233918 100644
--- a/js/BracketNode.js
+++ b/js/BracketNode.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/ConductivityTesterNode.js b/js/ConductivityTesterNode.js
index adf61da4b..a61ab98b1 100644
--- a/js/ConductivityTesterNode.js
+++ b/js/ConductivityTesterNode.js
@@ -13,7 +13,7 @@ import Dimension2 from '../../dot/js/Dimension2.js';
 import Utils from '../../dot/js/Utils.js';
 import Vector2 from '../../dot/js/Vector2.js';
 import Vector2Property from '../../dot/js/Vector2Property.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import ModelViewTransform2 from '../../phetcommon/js/view/ModelViewTransform2.js';
diff --git a/js/CurvedArrowShape.js b/js/CurvedArrowShape.js
index bb818d236..4562980d2 100644
--- a/js/CurvedArrowShape.js
+++ b/js/CurvedArrowShape.js
@@ -8,7 +8,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 sceneryPhet from './sceneryPhet.js';
 
diff --git a/js/Drawer.js b/js/Drawer.js
index eb50f98ec..20c4b2c95 100644
--- a/js/Drawer.js
+++ b/js/Drawer.js
@@ -9,7 +9,7 @@
 import Property from '../../axon/js/Property.js';
 import stepTimer from '../../axon/js/stepTimer.js';
 import Dimension2 from '../../dot/js/Dimension2.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { PressListener } from '../../scenery/js/imports.js';
diff --git a/js/EyeDropperNode.js b/js/EyeDropperNode.js
index af315fc94..8483df8b1 100644
--- a/js/EyeDropperNode.js
+++ b/js/EyeDropperNode.js
@@ -7,7 +7,7 @@
  */
 
 import Property from '../../axon/js/Property.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Circle } from '../../scenery/js/imports.js';
diff --git a/js/FaceNode.js b/js/FaceNode.js
index a80cc77dc..fd0937400 100644
--- a/js/FaceNode.js
+++ b/js/FaceNode.js
@@ -9,7 +9,7 @@
  */
 
 import DerivedProperty from '../../axon/js/DerivedProperty.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Circle } from '../../scenery/js/imports.js';
diff --git a/js/GaugeNode.js b/js/GaugeNode.js
index 8ff3497b3..a6178e284 100644
--- a/js/GaugeNode.js
+++ b/js/GaugeNode.js
@@ -11,7 +11,7 @@
 import Matrix3 from '../../dot/js/Matrix3.js';
 import Range from '../../dot/js/Range.js';
 import Utils from '../../dot/js/Utils.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Circle } from '../../scenery/js/imports.js';
diff --git a/js/GradientRectangle.js b/js/GradientRectangle.js
index 80427de66..3da264780 100644
--- a/js/GradientRectangle.js
+++ b/js/GradientRectangle.js
@@ -9,7 +9,7 @@
 
 import DerivedProperty from '../../axon/js/DerivedProperty.js';
 import Matrix3 from '../../dot/js/Matrix3.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import { Path } from '../../scenery/js/imports.js';
 import { Rectangle } from '../../scenery/js/imports.js';
 import { ColorDef } from '../../scenery/js/imports.js';
diff --git a/js/GridCheckbox.js b/js/GridCheckbox.js
index 4fe1805e3..ad84515e3 100644
--- a/js/GridCheckbox.js
+++ b/js/GridCheckbox.js
@@ -7,7 +7,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-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 Checkbox from '../../sun/js/Checkbox.js';
diff --git a/js/HandleNode.js b/js/HandleNode.js
index 9c0a89d7e..6dbb67771 100644
--- a/js/HandleNode.js
+++ b/js/HandleNode.js
@@ -9,7 +9,7 @@
  */
 
 import Matrix3 from '../../dot/js/Matrix3.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/HeaterCoolerBack.js b/js/HeaterCoolerBack.js
index a1a2b7821..a6dd100ec 100644
--- a/js/HeaterCoolerBack.js
+++ b/js/HeaterCoolerBack.js
@@ -10,7 +10,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 { Image } from '../../scenery/js/imports.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/HeaterCoolerFront.js b/js/HeaterCoolerFront.js
index dc18de291..9f7014491 100644
--- a/js/HeaterCoolerFront.js
+++ b/js/HeaterCoolerFront.js
@@ -12,7 +12,7 @@
 import BooleanProperty from '../../axon/js/BooleanProperty.js';
 import Dimension2 from '../../dot/js/Dimension2.js';
 import Range from '../../dot/js/Range.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/LightRaysNode.js b/js/LightRaysNode.js
index f4679c5ca..0816ac1a2 100644
--- a/js/LightRaysNode.js
+++ b/js/LightRaysNode.js
@@ -7,7 +7,7 @@
  */
 
 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 { Path } from '../../scenery/js/imports.js';
 import Tandem from '../../tandem/js/Tandem.js';
diff --git a/js/LineArrowNode.js b/js/LineArrowNode.js
index 562a47cd2..4b9d16b1f 100644
--- a/js/LineArrowNode.js
+++ b/js/LineArrowNode.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 InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/MatrixNode.js b/js/MatrixNode.js
index a01646f9e..41f853a15 100644
--- a/js/MatrixNode.js
+++ b/js/MatrixNode.js
@@ -15,7 +15,7 @@
 
 import Matrix3 from '../../dot/js/Matrix3.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 PhetFont from '../../scenery-phet/js/PhetFont.js';
 import { AlignBox } from '../../scenery/js/imports.js';
diff --git a/js/MeasuringTapeNode.js b/js/MeasuringTapeNode.js
index 1ebad1f43..773c7d290 100644
--- a/js/MeasuringTapeNode.js
+++ b/js/MeasuringTapeNode.js
@@ -18,7 +18,7 @@ import Bounds2 from '../../dot/js/Bounds2.js';
 import Utils from '../../dot/js/Utils.js';
 import Vector2 from '../../dot/js/Vector2.js';
 import Vector2Property from '../../dot/js/Vector2Property.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import StringUtils from '../../phetcommon/js/util/StringUtils.js';
diff --git a/js/NextPreviousNavigationNode.js b/js/NextPreviousNavigationNode.js
index 4177a8024..cd4903ba4 100644
--- a/js/NextPreviousNavigationNode.js
+++ b/js/NextPreviousNavigationNode.js
@@ -8,7 +8,7 @@
  */
 
 import Property from '../../axon/js/Property.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import merge from '../../phet-core/js/merge.js';
 import { FireListener } from '../../scenery/js/imports.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/NumberPicker.js b/js/NumberPicker.js
index c60d646ad..e3a437de9 100644
--- a/js/NumberPicker.js
+++ b/js/NumberPicker.js
@@ -14,7 +14,7 @@ import Property from '../../axon/js/Property.js';
 import Dimension2 from '../../dot/js/Dimension2.js';
 import Range from '../../dot/js/Range.js';
 import Utils from '../../dot/js/Utils.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import EnumerationDeprecated from '../../phet-core/js/EnumerationDeprecated.js';
 import merge from '../../phet-core/js/merge.js';
diff --git a/js/PaperAirplaneNode.js b/js/PaperAirplaneNode.js
index bd498e727..a5edfa226 100644
--- a/js/PaperAirplaneNode.js
+++ b/js/PaperAirplaneNode.js
@@ -6,7 +6,7 @@
  * @author John Blanco
  */
 
-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 PhetColorScheme from './PhetColorScheme.js';
diff --git a/js/ParametricSpringNode.js b/js/ParametricSpringNode.js
index f28ae931e..ab21210d0 100644
--- a/js/ParametricSpringNode.js
+++ b/js/ParametricSpringNode.js
@@ -22,7 +22,7 @@ import NumberProperty from '../../axon/js/NumberProperty.js';
 import Property from '../../axon/js/Property.js';
 import Range from '../../dot/js/Range.js';
 import Vector2 from '../../dot/js/Vector2.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Circle } from '../../scenery/js/imports.js';
diff --git a/js/PauseIconShape.js b/js/PauseIconShape.js
index fa74918e6..d808265b0 100644
--- a/js/PauseIconShape.js
+++ b/js/PauseIconShape.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 class PauseIconShape extends Shape {
diff --git a/js/PlayIconShape.js b/js/PlayIconShape.js
index 492423bc1..c112f24f6 100644
--- a/js/PlayIconShape.js
+++ b/js/PlayIconShape.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 class PlayIconShape extends Shape {
diff --git a/js/PlusShape.js b/js/PlusShape.js
index f1d7c20b2..9ec3abe82 100644
--- a/js/PlusShape.js
+++ b/js/PlusShape.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 class PlusShape extends Shape {
diff --git a/js/ProbeNode.js b/js/ProbeNode.js
index 421006cb8..8d7b0bfc8 100644
--- a/js/ProbeNode.js
+++ b/js/ProbeNode.js
@@ -15,17 +15,10 @@
 import DerivedProperty from '../../axon/js/DerivedProperty.js';
 import Ray2 from '../../dot/js/Ray2.js';
 import Vector2 from '../../dot/js/Vector2.js';
-import EllipticalArc from '../../kite/js/segments/EllipticalArc.js';
-import Shape from '../../kite/js/Shape.js';
+import { EllipticalArc, Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
-import { Circle } from '../../scenery/js/imports.js';
-import { Line } from '../../scenery/js/imports.js';
-import { Node } from '../../scenery/js/imports.js';
-import { Path } from '../../scenery/js/imports.js';
-import { LinearGradient } from '../../scenery/js/imports.js';
-import { PaintColorProperty } from '../../scenery/js/imports.js';
-import { RadialGradient } from '../../scenery/js/imports.js';
+import { Circle, Line, LinearGradient, Node, PaintColorProperty, Path, RadialGradient } from '../../scenery/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 // constants
diff --git a/js/ProtractorNode.js b/js/ProtractorNode.js
index a28891a30..fb3adefcd 100644
--- a/js/ProtractorNode.js
+++ b/js/ProtractorNode.js
@@ -10,7 +10,7 @@
  */
 
 import Property from '../../axon/js/Property.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import merge from '../../phet-core/js/merge.js';
 import sceneryPhet from '../../scenery-phet/js/sceneryPhet.js';
 import protractor_png from '../../scenery-phet/mipmaps/protractor_png.js';
diff --git a/js/ResetShape.js b/js/ResetShape.js
index b9c6a5e8f..d26585120 100644
--- a/js/ResetShape.js
+++ b/js/ResetShape.js
@@ -7,7 +7,7 @@
  * @author John Blanco
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 class ResetShape extends Shape {
diff --git a/js/RulerNode.js b/js/RulerNode.js
index 4373bcc0d..87628419d 100644
--- a/js/RulerNode.js
+++ b/js/RulerNode.js
@@ -7,7 +7,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/ShadedRectangle.js b/js/ShadedRectangle.js
index 3a12bd05c..b3f44de2f 100644
--- a/js/ShadedRectangle.js
+++ b/js/ShadedRectangle.js
@@ -7,7 +7,7 @@
  */
 
 import DerivedProperty from '../../axon/js/DerivedProperty.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/SpectrumSlider.js b/js/SpectrumSlider.js
index 34262a7b1..0ff31a439 100644
--- a/js/SpectrumSlider.js
+++ b/js/SpectrumSlider.js
@@ -12,7 +12,7 @@ import Property from '../../axon/js/Property.js';
 import Dimension2 from '../../dot/js/Dimension2.js';
 import Range from '../../dot/js/Range.js';
 import Utils from '../../dot/js/Utils.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import deprecationWarning from '../../phet-core/js/deprecationWarning.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
diff --git a/js/SpectrumSliderThumb.js b/js/SpectrumSliderThumb.js
index d42afdd7f..9a6754445 100644
--- a/js/SpectrumSliderThumb.js
+++ b/js/SpectrumSliderThumb.js
@@ -7,7 +7,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-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/StarNode.js b/js/StarNode.js
index eb050cca0..f1d05c389 100644
--- a/js/StarNode.js
+++ b/js/StarNode.js
@@ -7,7 +7,7 @@
  * @author John Blanco
  */
 
-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/StarShape.js b/js/StarShape.js
index c5465a7ee..8a9293b24 100644
--- a/js/StarShape.js
+++ b/js/StarShape.js
@@ -6,7 +6,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import merge from '../../phet-core/js/merge.js';
 import sceneryPhet from './sceneryPhet.js';
 
diff --git a/js/StopIconShape.js b/js/StopIconShape.js
index 8760d8958..751e4cd00 100644
--- a/js/StopIconShape.js
+++ b/js/StopIconShape.js
@@ -6,7 +6,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
 
 class StopIconShape extends Shape {
diff --git a/js/StopSignNode.js b/js/StopSignNode.js
index f965bcedf..3716dd09b 100644
--- a/js/StopSignNode.js
+++ b/js/StopSignNode.js
@@ -7,7 +7,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-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/TemperatureAndColorSensorNode.js b/js/TemperatureAndColorSensorNode.js
index cef5c1218..cc92699bc 100644
--- a/js/TemperatureAndColorSensorNode.js
+++ b/js/TemperatureAndColorSensorNode.js
@@ -9,7 +9,7 @@
  * @author John Blanco
  */
 
-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/ThermometerNode.js b/js/ThermometerNode.js
index 86116b4db..2e1b24e8e 100644
--- a/js/ThermometerNode.js
+++ b/js/ThermometerNode.js
@@ -12,7 +12,7 @@ import DerivedProperty from '../../axon/js/DerivedProperty.js';
 import LinearFunction from '../../dot/js/LinearFunction.js';
 import Range from '../../dot/js/Range.js';
 import Utils from '../../dot/js/Utils.js';
-import Shape from '../../kite/js/Shape.js';
+import { Shape } from '../../kite/js/imports.js';
 import InstanceRegistry from '../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../phet-core/js/merge.js';
 import { Node } from '../../scenery/js/imports.js';
diff --git a/js/UTurnArrowShape.js b/js/UTurnArrowShape.js
index 836395398..324ce192d 100644
--- a/js/UTurnArrowShape.js
+++ b/js/UTurnArrowShape.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 sceneryPhet from './sceneryPhet.js';
 
 class UTurnArrowShape extends Shape {
diff --git a/js/WireNode.ts b/js/WireNode.ts
index 2b6d39230..175d73b2f 100644
--- a/js/WireNode.ts
+++ b/js/WireNode.ts
@@ -10,7 +10,7 @@ import IReadOnlyProperty from '../../axon/js/IReadOnlyProperty.js';
 import Multilink from '../../axon/js/Multilink.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 { Path, PathOptions } from '../../scenery/js/imports.js';
 import sceneryPhet from './sceneryPhet.js';
diff --git a/js/buttons/CloseButton.js b/js/buttons/CloseButton.js
index 8aa20c5a8..94cc96660 100644
--- a/js/buttons/CloseButton.js
+++ b/js/buttons/CloseButton.js
@@ -8,7 +8,7 @@
  * @author Jesse Greenberg (PhET Interactive Simulations)
  */
 
-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/buttons/RestartButton.js b/js/buttons/RestartButton.js
index 22660efbb..de1d744a5 100644
--- a/js/buttons/RestartButton.js
+++ b/js/buttons/RestartButton.js
@@ -6,7 +6,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import Shape from '../../../kite/js/Shape.js';
+import { Shape } from '../../../kite/js/imports.js';
 import InstanceRegistry from '../../../phet-core/js/documentation/InstanceRegistry.js';
 import { HBox } from '../../../scenery/js/imports.js';
 import { Path } from '../../../scenery/js/imports.js';
diff --git a/js/buttons/SoundToggleButton.js b/js/buttons/SoundToggleButton.js
index 58bcc9e7a..b2cd425e5 100644
--- a/js/buttons/SoundToggleButton.js
+++ b/js/buttons/SoundToggleButton.js
@@ -8,7 +8,7 @@
  * @author Sam Reid (PhET Interactive Simulations)
  */
 
-import Shape from '../../../kite/js/Shape.js';
+import { Shape } from '../../../kite/js/imports.js';
 import InstanceRegistry from '../../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../../phet-core/js/merge.js';
 import { Node } from '../../../scenery/js/imports.js';
diff --git a/js/buttons/StepButton.js b/js/buttons/StepButton.js
index df35fdcec..5a9ee56fb 100644
--- a/js/buttons/StepButton.js
+++ b/js/buttons/StepButton.js
@@ -8,7 +8,7 @@
  * @author Chris Malley (PixelZoom, Inc.)
  */
 
-import Shape from '../../../kite/js/Shape.js';
+import { Shape } from '../../../kite/js/imports.js';
 import InstanceRegistry from '../../../phet-core/js/documentation/InstanceRegistry.js';
 import merge from '../../../phet-core/js/merge.js';
 import { HBox } from '../../../scenery/js/imports.js';
diff --git a/js/buttons/TimerToggleButton.js b/js/buttons/TimerToggleButton.js
index 9f90bbf4d..077afa597 100644
--- a/js/buttons/TimerToggleButton.js
+++ b/js/buttons/TimerToggleButton.js
@@ -6,7 +6,7 @@
  * @author John Blanco
  */
 
-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/capacitor/BoxShapeCreator.js b/js/capacitor/BoxShapeCreator.js
index 061e8fe38..c497ff851 100644
--- a/js/capacitor/BoxShapeCreator.js
+++ b/js/capacitor/BoxShapeCreator.js
@@ -10,7 +10,7 @@
  * @author Andrew Adare (PhET Interactive Simulations)
  */
 
-import Shape from '../../../kite/js/Shape.js';
+import { Shape } from '../../../kite/js/imports.js';
 import sceneryPhet from '../sceneryPhet.js';
 import YawPitchModelViewTransform3 from './YawPitchModelViewTransform3.js';
 
diff --git a/js/capacitor/CapacitorNode.js b/js/capacitor/CapacitorNode.js
index 1364161e2..ebddfc3d0 100644
--- a/js/capacitor/CapacitorNode.js
+++ b/js/capacitor/CapacitorNode.js
@@ -11,7 +11,7 @@
 import Property from '../../../axon/js/Property.js';
 import validate from '../../../axon/js/validate.js';
 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 Orientation from '../../../phet-core/js/Orientation.js';
 import { Node } from '../../../scenery/js/imports.js';
diff --git a/js/demo/ComponentsScreenView.js b/js/demo/ComponentsScreenView.js
index d7c107950..b967b7d18 100644
--- a/js/demo/ComponentsScreenView.js
+++ b/js/demo/ComponentsScreenView.js
@@ -22,7 +22,7 @@ import dotRandom from '../../../dot/js/dotRandom.js';
 import Range from '../../../dot/js/Range.js';
 import Vector2 from '../../../dot/js/Vector2.js';
 import Vector2Property from '../../../dot/js/Vector2Property.js';
-import Shape from '../../../kite/js/Shape.js';
+import { Shape } from '../../../kite/js/imports.js';
 import arrayRemove from '../../../phet-core/js/arrayRemove.js';
 import merge from '../../../phet-core/js/merge.js';
 import { Circle, Color, DragListener, FlowBox, GridBox, HBox, HeightSizable, KeyboardDragListener, ManualConstraint, Node, NodeProperty, Path, Rectangle, RichText, Sprite, SpriteImage, SpriteInstance, SpriteListenable, Sprites, Text, VBox, WidthSizable } from '../../../scenery/js/imports.js';
diff --git a/js/keyboard/ArrowKeyNode.js b/js/keyboard/ArrowKeyNode.js
index a81439cac..c4ec6f644 100644
--- a/js/keyboard/ArrowKeyNode.js
+++ b/js/keyboard/ArrowKeyNode.js
@@ -6,7 +6,7 @@
  * @author Jesse Greenberg
  */
 
-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 sceneryPhet from '../sceneryPhet.js';