re-organizing the code to follow single screen structure, see issue #118

phetsims · Mar 21, 2016 · e2a25de · e2a25de
1 parent 6f57d97
commit e2a25de
Show file tree

Hide file tree

Showing 40 changed files with 54 additions and 54 deletions.
diff --git a/js/UnderPressureScreen.js b/js/UnderPressureScreen.js
@@ -11,8 +11,8 @@ define( function( require ) {
 
   // modules
   var Bounds2 = require( 'DOT/Bounds2' );
-  var UnderPressureModel = require( 'UNDER_PRESSURE/common/model/UnderPressureModel' );
-  var UnderPressureView = require( 'UNDER_PRESSURE/common/view/UnderPressureView' );
+  var UnderPressureModel = require( 'UNDER_PRESSURE/under-pressure/model/UnderPressureModel' );
+  var UnderPressureView = require( 'UNDER_PRESSURE/under-pressure/view/UnderPressureView' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Image = require( 'SCENERY/nodes/Image' );
   var Screen = require( 'JOIST/Screen' );

diff --git a/js/common/UnderPressureConstants.js → js/under-pressure/UnderPressureConstants.js b/js/common/UnderPressureConstants.js → js/under-pressure/UnderPressureConstants.js
diff --git a/js/chamber-pool/model/ChamberPoolModel.js → js/under-pressure/model/ChamberPoolModel.js b/js/chamber-pool/model/ChamberPoolModel.js → js/under-pressure/model/ChamberPoolModel.js
@@ -14,7 +14,7 @@ define( function( require ) {
   var PropertySet = require( 'AXON/PropertySet' );
   var ObservableArray = require( 'AXON/ObservableArray' );
   var inherit = require( 'PHET_CORE/inherit' );
-  var MassModel = require( 'UNDER_PRESSURE/chamber-pool/model/MassModel' );
+  var MassModel = require( 'UNDER_PRESSURE/under-pressure/model/MassModel' );
 
   // constants
   var lastDt = 0;//to filter dt in step.

diff --git a/js/common/model/FaucetModel.js → js/under-pressure/model/FaucetModel.js b/js/common/model/FaucetModel.js → js/under-pressure/model/FaucetModel.js
diff --git a/js/common/model/FluidColorModel.js → js/under-pressure/model/FluidColorModel.js b/js/common/model/FluidColorModel.js → js/under-pressure/model/FluidColorModel.js
@@ -15,7 +15,7 @@ define( function( require ) {
   var inherit = require( 'PHET_CORE/inherit' );
   var Color = require( 'SCENERY/util/Color' );
   var LinearFunction = require( 'DOT/LinearFunction' );
-  var UnderPressureConstants = require( 'UNDER_PRESSURE/common/UnderPressureConstants' );
+  var UnderPressureConstants = require( 'UNDER_PRESSURE/under-pressure/UnderPressureConstants' );
 
   // Color constants, from the Java version
   var GAS_COLOR = new Color( 149, 142, 139 );

diff --git a/js/chamber-pool/model/MassModel.js → js/under-pressure/model/MassModel.js b/js/chamber-pool/model/MassModel.js → js/under-pressure/model/MassModel.js
diff --git a/js/mystery-pool/model/MysteryPoolModel.js → js/under-pressure/model/MysteryPoolModel.js b/js/mystery-pool/model/MysteryPoolModel.js → js/under-pressure/model/MysteryPoolModel.js
@@ -11,7 +11,7 @@ define( function( require ) {
 
   // modules
   var inherit = require( 'PHET_CORE/inherit' );
-  var SquarePoolModel = require( 'UNDER_PRESSURE/square-pool/model/SquarePoolModel' );
+  var SquarePoolModel = require( 'UNDER_PRESSURE/under-pressure/model/SquarePoolModel' );
   var Property = require( 'AXON/Property' );
   var PropertySet = require( 'AXON/PropertySet' );
   var Color = require( 'SCENERY/util/Color' );

diff --git a/js/common/model/PoolWithFaucetsModel.js → ...er-pressure/model/PoolWithFaucetsModel.js b/js/common/model/PoolWithFaucetsModel.js → ...er-pressure/model/PoolWithFaucetsModel.js
diff --git a/js/common/model/Sensor.js → js/under-pressure/model/Sensor.js b/js/common/model/Sensor.js → js/under-pressure/model/Sensor.js
diff --git a/js/square-pool/model/SquarePoolModel.js → js/under-pressure/model/SquarePoolModel.js b/js/square-pool/model/SquarePoolModel.js → js/under-pressure/model/SquarePoolModel.js
@@ -12,8 +12,8 @@ define( function( require ) {
   // modules
   var inherit = require( 'PHET_CORE/inherit' );
   var Vector2 = require( 'DOT/Vector2' );
-  var PoolWithFaucetsModel = require( 'UNDER_PRESSURE/common/model/PoolWithFaucetsModel' );
-  var FaucetModel = require( 'UNDER_PRESSURE/common/model/FaucetModel' );
+  var PoolWithFaucetsModel = require( 'UNDER_PRESSURE/under-pressure/model/PoolWithFaucetsModel' );
+  var FaucetModel = require( 'UNDER_PRESSURE/under-pressure/model/FaucetModel' );
 
   /**
    * @param {UnderPressureModel} underPressureModel of the simulation

diff --git a/...rapezoid-pool/model/TrapezoidPoolModel.js → ...nder-pressure/model/TrapezoidPoolModel.js b/...rapezoid-pool/model/TrapezoidPoolModel.js → ...nder-pressure/model/TrapezoidPoolModel.js
@@ -11,8 +11,8 @@ define( function( require ) {
 // modules
   var inherit = require( 'PHET_CORE/inherit' );
   var Vector2 = require( 'DOT/Vector2' );
-  var PoolWithFaucetsModel = require( 'UNDER_PRESSURE/common/model/PoolWithFaucetsModel' );
-  var FaucetModel = require( 'UNDER_PRESSURE/common/model/FaucetModel' );
+  var PoolWithFaucetsModel = require( 'UNDER_PRESSURE/under-pressure/model/PoolWithFaucetsModel' );
+  var FaucetModel = require( 'UNDER_PRESSURE/under-pressure/model/FaucetModel' );
   var LinearFunction = require( 'DOT/LinearFunction' );
 
 // constants

diff --git a/js/common/model/UnderPressureModel.js → ...nder-pressure/model/UnderPressureModel.js b/js/common/model/UnderPressureModel.js → ...nder-pressure/model/UnderPressureModel.js
@@ -13,16 +13,16 @@ define( function( require ) {
   var PropertySet = require( 'AXON/PropertySet' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Range = require( 'DOT/Range' );
-  var FluidColorModel = require( 'UNDER_PRESSURE/common/model/FluidColorModel' );
-  var Units = require( 'UNDER_PRESSURE/common/model/Units' );
-  var UnderPressureConstants = require( 'UNDER_PRESSURE/common/UnderPressureConstants' );
+  var FluidColorModel = require( 'UNDER_PRESSURE/under-pressure/model/FluidColorModel' );
+  var Units = require( 'UNDER_PRESSURE/under-pressure/model/Units' );
+  var UnderPressureConstants = require( 'UNDER_PRESSURE/under-pressure/UnderPressureConstants' );
   var Vector2 = require( 'DOT/Vector2' );
-  var Sensor = require( 'UNDER_PRESSURE/common/model/Sensor' );
-  var SquarePoolModel = require( 'UNDER_PRESSURE/square-pool/model/SquarePoolModel' );
-  var TrapezoidPoolModel = require( 'UNDER_PRESSURE/trapezoid-pool/model/TrapezoidPoolModel' );
-  var ChamberPoolModel = require( 'UNDER_PRESSURE/chamber-pool/model/ChamberPoolModel' );
-  var MysteryPoolModel = require( 'UNDER_PRESSURE/mystery-pool/model/MysteryPoolModel' );
-  var getStandardAirPressure = require( 'UNDER_PRESSURE/common/model/getStandardAirPressure' );
+  var Sensor = require( 'UNDER_PRESSURE/under-pressure/model/Sensor' );
+  var SquarePoolModel = require( 'UNDER_PRESSURE/under-pressure/model/SquarePoolModel' );
+  var TrapezoidPoolModel = require( 'UNDER_PRESSURE/under-pressure/model/TrapezoidPoolModel' );
+  var ChamberPoolModel = require( 'UNDER_PRESSURE/under-pressure/model/ChamberPoolModel' );
+  var MysteryPoolModel = require( 'UNDER_PRESSURE/under-pressure/model/MysteryPoolModel' );
+  var getStandardAirPressure = require( 'UNDER_PRESSURE/under-pressure/model/getStandardAirPressure' );
 
   // constants
   var NUM_BAROMETERS = 4;

diff --git a/js/common/model/Units.js → js/under-pressure/model/Units.js b/js/common/model/Units.js → js/under-pressure/model/Units.js
diff --git a/js/common/model/getStandardAirPressure.js → ...-pressure/model/getStandardAirPressure.js b/js/common/model/getStandardAirPressure.js → ...-pressure/model/getStandardAirPressure.js
@@ -10,7 +10,7 @@ define( function( require ) {
   'use strict';
 
   var Util = require( 'DOT/Util' );
-  var UnderPressureConstants = require( 'UNDER_PRESSURE/common/UnderPressureConstants' );
+  var UnderPressureConstants = require( 'UNDER_PRESSURE/under-pressure/UnderPressureConstants' );
 
   /**
    * Calculates the standard air pressure by linearly extrapolating the known values for height = 0m & height = 150m

diff --git a/js/common/view/AtmosphereControlNode.js → ...er-pressure/view/AtmosphereControlNode.js b/js/common/view/AtmosphereControlNode.js → ...er-pressure/view/AtmosphereControlNode.js
diff --git a/js/common/view/BackgroundNode.js → js/under-pressure/view/BackgroundNode.js b/js/common/view/BackgroundNode.js → js/under-pressure/view/BackgroundNode.js
diff --git a/js/common/view/BarometerNode.js → js/under-pressure/view/BarometerNode.js b/js/common/view/BarometerNode.js → js/under-pressure/view/BarometerNode.js
@@ -25,7 +25,7 @@ define( function( require ) {
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
   var MovableDragHandler = require( 'SCENERY_PHET/input/MovableDragHandler' );
   var Property = require( 'AXON/Property' );
-  var UnderPressureConstants = require( 'UNDER_PRESSURE/common/UnderPressureConstants' );
+  var UnderPressureConstants = require( 'UNDER_PRESSURE/under-pressure/UnderPressureConstants' );
 
   // strings
   var pressureString = require( 'string!UNDER_PRESSURE/pressure' );

diff --git a/js/chamber-pool/view/ChamberPoolBack.js → js/under-pressure/view/ChamberPoolBack.js b/js/chamber-pool/view/ChamberPoolBack.js → js/under-pressure/view/ChamberPoolBack.js
diff --git a/js/chamber-pool/view/ChamberPoolView.js → js/under-pressure/view/ChamberPoolView.js b/js/chamber-pool/view/ChamberPoolView.js → js/under-pressure/view/ChamberPoolView.js
@@ -12,11 +12,11 @@ define( function( require ) {
   // modules
   var inherit = require( 'PHET_CORE/inherit' );
   var Node = require( 'SCENERY/nodes/Node' );
-  var ChamberPoolBack = require( 'UNDER_PRESSURE/chamber-pool/view/ChamberPoolBack' );
-  var ChamberPoolWaterNode = require( 'UNDER_PRESSURE/chamber-pool/view/ChamberPoolWaterNode' );
-  var MassNode = require( 'UNDER_PRESSURE/chamber-pool/view/MassNode' );
-  var MassStackNode = require( 'UNDER_PRESSURE/chamber-pool/view/MassStackNode' );
-  var TrapezoidPoolGrid = require( 'UNDER_PRESSURE/trapezoid-pool/view/TrapezoidPoolGrid' );
+  var ChamberPoolBack = require( 'UNDER_PRESSURE/under-pressure/view/ChamberPoolBack' );
+  var ChamberPoolWaterNode = require( 'UNDER_PRESSURE/under-pressure/view/ChamberPoolWaterNode' );
+  var MassNode = require( 'UNDER_PRESSURE/under-pressure/view/MassNode' );
+  var MassStackNode = require( 'UNDER_PRESSURE/under-pressure/view/MassStackNode' );
+  var TrapezoidPoolGrid = require( 'UNDER_PRESSURE/under-pressure/view/TrapezoidPoolGrid' );
 
   /**
    *

diff --git a/js/chamber-pool/view/ChamberPoolWaterNode.js → ...der-pressure/view/ChamberPoolWaterNode.js b/js/chamber-pool/view/ChamberPoolWaterNode.js → ...der-pressure/view/ChamberPoolWaterNode.js
diff --git a/js/common/view/ControlPanel.js → js/under-pressure/view/ControlPanel.js b/js/common/view/ControlPanel.js → js/under-pressure/view/ControlPanel.js
@@ -18,7 +18,7 @@ define( function( require ) {
   var CheckBox = require( 'SUN/CheckBox' );
   var Text = require( 'SCENERY/nodes/Text' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
-  var AtmosphereControlNode = require( 'UNDER_PRESSURE/common/view/AtmosphereControlNode' );
+  var AtmosphereControlNode = require( 'UNDER_PRESSURE/under-pressure/view/AtmosphereControlNode' );
   var RulerNode = require( 'SCENERY_PHET/RulerNode' );
   var Bounds2 = require( 'DOT/Bounds2' );
 

diff --git a/js/common/view/ControlSlider.js → js/under-pressure/view/ControlSlider.js b/js/common/view/ControlSlider.js → js/under-pressure/view/ControlSlider.js
diff --git a/js/common/view/FaucetFluidNode.js → js/under-pressure/view/FaucetFluidNode.js b/js/common/view/FaucetFluidNode.js → js/under-pressure/view/FaucetFluidNode.js
diff --git a/js/common/view/GridLinesNode.js → js/under-pressure/view/GridLinesNode.js b/js/common/view/GridLinesNode.js → js/under-pressure/view/GridLinesNode.js
@@ -12,7 +12,7 @@ define( function( require ) {
   var inherit = require( 'PHET_CORE/inherit' );
   var Node = require( 'SCENERY/nodes/Node' );
   var Line = require( 'SCENERY/nodes/Line' );
-  var Units = require( 'UNDER_PRESSURE/common/model/Units' );
+  var Units = require( 'UNDER_PRESSURE/under-pressure/model/Units' );
 
   /**
    * Draw grid lines in rect (x1, y1, x2 , y2)

diff --git a/js/chamber-pool/view/MassNode.js → js/under-pressure/view/MassNode.js b/js/chamber-pool/view/MassNode.js → js/under-pressure/view/MassNode.js
diff --git a/js/chamber-pool/view/MassStackNode.js → js/under-pressure/view/MassStackNode.js b/js/chamber-pool/view/MassStackNode.js → js/under-pressure/view/MassStackNode.js
diff --git a/js/mystery-pool/view/MysteryPoolView.js → js/under-pressure/view/MysteryPoolView.js b/js/mystery-pool/view/MysteryPoolView.js → js/under-pressure/view/MysteryPoolView.js
@@ -19,7 +19,7 @@ define( function( require ) {
   var Panel = require( 'SUN/Panel' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
   var inherit = require( 'PHET_CORE/inherit' );
-  var SquarePoolView = require( 'UNDER_PRESSURE/square-pool/view/SquarePoolView' );
+  var SquarePoolView = require( 'UNDER_PRESSURE/under-pressure/view/SquarePoolView' );
   var Text = require( 'SCENERY/nodes/Text' );
   var VBox = require( 'SCENERY/nodes/VBox' );
 

diff --git a/js/common/view/SceneChoiceNode.js → js/under-pressure/view/SceneChoiceNode.js b/js/common/view/SceneChoiceNode.js → js/under-pressure/view/SceneChoiceNode.js
diff --git a/js/square-pool/view/SquarePoolBack.js → js/under-pressure/view/SquarePoolBack.js b/js/square-pool/view/SquarePoolBack.js → js/under-pressure/view/SquarePoolBack.js
@@ -16,7 +16,7 @@ define( function( require ) {
   var Matrix3 = require( 'DOT/Matrix3' );
   var Shape = require( 'KITE/Shape' );
   var Path = require( 'SCENERY/nodes/Path' );
-  var UnderPressureFaucetNode = require( 'UNDER_PRESSURE/common/view/UnderPressureFaucetNode' );
+  var UnderPressureFaucetNode = require( 'UNDER_PRESSURE/under-pressure/view/UnderPressureFaucetNode' );
 
   // images
   var grassImg = require( 'image!UNDER_PRESSURE/grass-texture.png' );

diff --git a/js/square-pool/view/SquarePoolGrid.js → js/under-pressure/view/SquarePoolGrid.js b/js/square-pool/view/SquarePoolGrid.js → js/under-pressure/view/SquarePoolGrid.js
@@ -13,10 +13,10 @@ define( function( require ) {
   var Node = require( 'SCENERY/nodes/Node' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Text = require( 'SCENERY/nodes/Text' );
-  var GridLinesNode = require( 'UNDER_PRESSURE/common/view/GridLinesNode' );
+  var GridLinesNode = require( 'UNDER_PRESSURE/under-pressure/view/GridLinesNode' );
   var StringUtils = require( 'PHETCOMMON/util/StringUtils' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
-  var Units = require( 'UNDER_PRESSURE/common/model/Units' );
+  var Units = require( 'UNDER_PRESSURE/under-pressure/model/Units' );
 
   // strings
   var readoutMetersString = require( 'string!UNDER_PRESSURE/readoutMeters' );

diff --git a/js/square-pool/view/SquarePoolView.js → js/under-pressure/view/SquarePoolView.js b/js/square-pool/view/SquarePoolView.js → js/under-pressure/view/SquarePoolView.js
@@ -11,10 +11,10 @@ define( function( require ) {
   //modules
   var inherit = require( 'PHET_CORE/inherit' );
   var Node = require( 'SCENERY/nodes/Node' );
-  var SquarePoolBack = require( 'UNDER_PRESSURE/square-pool/view/SquarePoolBack' );
-  var FaucetFluidNode = require( 'UNDER_PRESSURE/common/view/FaucetFluidNode' );
-  var SquarePoolWaterNode = require( 'UNDER_PRESSURE/square-pool/view/SquarePoolWaterNode' );
-  var SquarePoolGrid = require( 'UNDER_PRESSURE/square-pool/view/SquarePoolGrid' );
+  var SquarePoolBack = require( 'UNDER_PRESSURE/under-pressure/view/SquarePoolBack' );
+  var FaucetFluidNode = require( 'UNDER_PRESSURE/under-pressure/view/FaucetFluidNode' );
+  var SquarePoolWaterNode = require( 'UNDER_PRESSURE/under-pressure/view/SquarePoolWaterNode' );
+  var SquarePoolGrid = require( 'UNDER_PRESSURE/under-pressure/view/SquarePoolGrid' );
 
   /**
    * @param {SquarePoolModel} squarePoolModel of the simulation

diff --git a/js/square-pool/view/SquarePoolWaterNode.js → ...nder-pressure/view/SquarePoolWaterNode.js b/js/square-pool/view/SquarePoolWaterNode.js → ...nder-pressure/view/SquarePoolWaterNode.js
diff --git a/js/trapezoid-pool/view/TrapezoidPoolBack.js → js/under-pressure/view/TrapezoidPoolBack.js b/js/trapezoid-pool/view/TrapezoidPoolBack.js → js/under-pressure/view/TrapezoidPoolBack.js
@@ -17,7 +17,7 @@ define( function( require ) {
   var Matrix3 = require( 'DOT/Matrix3' );
   var Shape = require( 'KITE/Shape' );
   var Path = require( 'SCENERY/nodes/Path' );
-  var UnderPressureFaucetNode = require( 'UNDER_PRESSURE/common/view/UnderPressureFaucetNode' );
+  var UnderPressureFaucetNode = require( 'UNDER_PRESSURE/under-pressure/view/UnderPressureFaucetNode' );
 
   // images
   var grassImg = require( 'image!UNDER_PRESSURE/grass-texture.png' );

diff --git a/js/trapezoid-pool/view/TrapezoidPoolGrid.js → js/under-pressure/view/TrapezoidPoolGrid.js b/js/trapezoid-pool/view/TrapezoidPoolGrid.js → js/under-pressure/view/TrapezoidPoolGrid.js
@@ -14,7 +14,7 @@ define( function( require ) {
   var Node = require( 'SCENERY/nodes/Node' );
   var inherit = require( 'PHET_CORE/inherit' );
   var Text = require( 'SCENERY/nodes/Text' );
-  var GridLinesNode = require( 'UNDER_PRESSURE/common/view/GridLinesNode' );
+  var GridLinesNode = require( 'UNDER_PRESSURE/under-pressure/view/GridLinesNode' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
   var Rectangle = require( 'SCENERY/nodes/Rectangle' );
   var StringUtils = require( 'PHETCOMMON/util/StringUtils' );

diff --git a/js/trapezoid-pool/view/TrapezoidPoolView.js → js/under-pressure/view/TrapezoidPoolView.js b/js/trapezoid-pool/view/TrapezoidPoolView.js → js/under-pressure/view/TrapezoidPoolView.js
@@ -11,10 +11,10 @@ define( function( require ) {
   // modules
   var inherit = require( 'PHET_CORE/inherit' );
   var Node = require( 'SCENERY/nodes/Node' );
-  var TrapezoidPoolBack = require( 'UNDER_PRESSURE/trapezoid-pool/view/TrapezoidPoolBack' );
-  var FaucetFluidNode = require( 'UNDER_PRESSURE/common/view/FaucetFluidNode' );
-  var TrapezoidPoolWaterNode = require( 'UNDER_PRESSURE/trapezoid-pool/view/TrapezoidPoolWaterNode' );
-  var TrapezoidPoolGrid = require( 'UNDER_PRESSURE/trapezoid-pool/view/TrapezoidPoolGrid' );
+  var TrapezoidPoolBack = require( 'UNDER_PRESSURE/under-pressure/view/TrapezoidPoolBack' );
+  var FaucetFluidNode = require( 'UNDER_PRESSURE/under-pressure/view/FaucetFluidNode' );
+  var TrapezoidPoolWaterNode = require( 'UNDER_PRESSURE/under-pressure/view/TrapezoidPoolWaterNode' );
+  var TrapezoidPoolGrid = require( 'UNDER_PRESSURE/under-pressure/view/TrapezoidPoolGrid' );
 
   /**
    * @param {TrapezoidPoolModel} trapezoidPoolModel

diff --git a/...ezoid-pool/view/TrapezoidPoolWaterNode.js → ...r-pressure/view/TrapezoidPoolWaterNode.js b/...ezoid-pool/view/TrapezoidPoolWaterNode.js → ...r-pressure/view/TrapezoidPoolWaterNode.js
diff --git a/js/common/view/UnderPressureFaucetNode.js → ...-pressure/view/UnderPressureFaucetNode.js b/js/common/view/UnderPressureFaucetNode.js → ...-pressure/view/UnderPressureFaucetNode.js
diff --git a/js/common/view/UnderPressureRuler.js → js/under-pressure/view/UnderPressureRuler.js b/js/common/view/UnderPressureRuler.js → js/under-pressure/view/UnderPressureRuler.js
@@ -18,7 +18,7 @@ define( function( require ) {
   var MovableDragHandler = require( 'SCENERY_PHET/input/MovableDragHandler' );
   var RectangularPushButton = require( 'SUN/buttons/RectangularPushButton' );
   var PhetFont = require( 'SCENERY_PHET/PhetFont' );
-  var Units = require( 'UNDER_PRESSURE/common/model/Units' );
+  var Units = require( 'UNDER_PRESSURE/under-pressure/model/Units' );
   var PhetColorScheme = require( 'SCENERY_PHET/PhetColorScheme' );
 
   // strings

diff --git a/js/common/view/UnderPressureView.js → js/under-pressure/view/UnderPressureView.js b/js/common/view/UnderPressureView.js → js/under-pressure/view/UnderPressureView.js
@@ -13,24 +13,24 @@ define( function( require ) {
 
   // modules
   var inherit = require( 'PHET_CORE/inherit' );
-  var BackgroundNode = require( 'UNDER_PRESSURE/common/view/BackgroundNode' );
+  var BackgroundNode = require( 'UNDER_PRESSURE/under-pressure/view/BackgroundNode' );
   var ScreenView = require( 'JOIST/ScreenView' );
-  var UnderPressureRuler = require( 'UNDER_PRESSURE/common/view/UnderPressureRuler' );
+  var UnderPressureRuler = require( 'UNDER_PRESSURE/under-pressure/view/UnderPressureRuler' );
   var ModelViewTransform2 = require( 'PHETCOMMON/view/ModelViewTransform2' );
   var Vector2 = require( 'DOT/Vector2' );
   var Bounds2 = require( 'DOT/Bounds2' );
-  var ControlPanel = require( 'UNDER_PRESSURE/common/view/ControlPanel' );
-  var UnitsControlPanel = require( 'UNDER_PRESSURE/common/view/UnitsControlPanel' );
-  var ControlSlider = require( 'UNDER_PRESSURE/common/view/ControlSlider' );
-  var SceneChoiceNode = require( 'UNDER_PRESSURE/common/view/SceneChoiceNode' );
+  var ControlPanel = require( 'UNDER_PRESSURE/under-pressure/view/ControlPanel' );
+  var UnitsControlPanel = require( 'UNDER_PRESSURE/under-pressure/view/UnitsControlPanel' );
+  var ControlSlider = require( 'UNDER_PRESSURE/under-pressure/view/ControlSlider' );
+  var SceneChoiceNode = require( 'UNDER_PRESSURE/under-pressure/view/SceneChoiceNode' );
   var ResetAllButton = require( 'SCENERY_PHET/buttons/ResetAllButton' );
   var Rectangle = require( 'SCENERY/nodes/Rectangle' );
-  var BarometerNode = require( 'UNDER_PRESSURE/common/view/BarometerNode' );
-  var UnderPressureConstants = require( 'UNDER_PRESSURE/common/UnderPressureConstants' );
-  var SquarePoolView = require( 'UNDER_PRESSURE/square-pool/view/SquarePoolView' );
-  var TrapezoidPoolView = require( 'UNDER_PRESSURE/trapezoid-pool/view/TrapezoidPoolView' );
-  var ChamberPoolView = require( 'UNDER_PRESSURE/chamber-pool/view/ChamberPoolView' );
-  var MysteryPoolView = require( 'UNDER_PRESSURE/mystery-pool/view/MysteryPoolView' );
+  var BarometerNode = require( 'UNDER_PRESSURE/under-pressure/view/BarometerNode' );
+  var UnderPressureConstants = require( 'UNDER_PRESSURE/under-pressure/UnderPressureConstants' );
+  var SquarePoolView = require( 'UNDER_PRESSURE/under-pressure/view/SquarePoolView' );
+  var TrapezoidPoolView = require( 'UNDER_PRESSURE/under-pressure/view/TrapezoidPoolView' );
+  var ChamberPoolView = require( 'UNDER_PRESSURE/under-pressure/view/ChamberPoolView' );
+  var MysteryPoolView = require( 'UNDER_PRESSURE/under-pressure/view/MysteryPoolView' );
   var Node = require( 'SCENERY/nodes/Node' );
 
   // strings

diff --git a/js/common/view/UnitsControlPanel.js → js/under-pressure/view/UnitsControlPanel.js b/js/common/view/UnitsControlPanel.js → js/under-pressure/view/UnitsControlPanel.js