More Targetted import

src/Cameras/Inputs/arcRotateCameraGamepadInput.ts

@@ -1,7 +1,9 @@
-import { ICameraInput, ArcRotateCamera, CameraInputTypes } from "index";
 import { Nullable } from "types";
-import { serialize, Observer } from "Tools";
-import { Gamepad } from "Gamepad";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { Gamepad } from "Gamepad/gamepad";
     /**
      * Manage the gamepad inputs to control an arc rotate camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Inputs/arcRotateCameraKeyboardMoveInput.ts

@@ -1,9 +1,11 @@
-import { serialize, Observer } from "Tools";
 import { Nullable } from "types";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
 import { Scene } from "scene";
-import { ICameraInput, ArcRotateCamera, CameraInputTypes } from "Cameras";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
 import { Engine } from "Engine";
-import { KeyboardInfo, KeyboardEventTypes } from "Events";
+import { KeyboardInfo, KeyboardEventTypes } from "Events/keyboardEvents";
 
     /**
      * Manage the keyboard inputs to control the movement of an arc rotate camera.

src/Cameras/Inputs/arcRotateCameraMouseWheelInput.ts

@@ -1,7 +1,9 @@
-import { serialize, Observer, EventState } from "Tools";
 import { Nullable } from "types";
-import { ICameraInput, ArcRotateCamera, CameraInputTypes } from "Cameras";
-import { PointerInfo, PointerEventTypes } from "Events";
+import { serialize } from "Tools/decorators";
+import { EventState, Observer } from "Tools/observable";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
 
     /**
      * Manage the mouse wheel inputs to control an arc rotate camera.

src/Cameras/Inputs/arcRotateCameraPointersInput.ts

@@ -1,7 +1,10 @@
-import { serialize, EventState, Observer, Tools } from "Tools";
 import { Nullable } from "types";
-import { ICameraInput, ArcRotateCamera, CameraInputTypes } from "Cameras";
-import { PointerInfo, PointerEventTypes } from "Events";
+import { serialize } from "Tools/decorators";
+import { EventState, Observer } from "Tools/observable";
+import { Tools } from "Tools/tools";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
 
     /**
      * Manage the pointers inputs to control an arc rotate camera.

src/Cameras/Inputs/arcRotateCameraVRDeviceOrientationInput.ts

@@ -1,5 +1,6 @@
 import { Nullable } from "types";
-import { ICameraInput, ArcRotateCamera, CameraInputTypes } from "Cameras";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
 
     /**
      * Manage the device orientation inputs (gyroscope) to control an arc rotate camera.

src/Cameras/Inputs/flyCameraKeyboardInput.ts

@@ -1,10 +1,12 @@
-import { serialize, Observer } from "Tools";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FlyCamera } from "Cameras";
-import { Engine } from "Engine";
-import { KeyboardInfo, KeyboardEventTypes } from "Events";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FlyCamera } from "Cameras/flyCamera";
+import { Engine } from "Engine/engine";
+import { KeyboardInfo, KeyboardEventTypes } from "Events/keyboardEvents";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
+import { Vector3 } from "Math/math";
 
     /**
      * Listen to keyboard events to control the camera.

src/Cameras/Inputs/flyCameraMouseInput.ts

@@ -1,9 +1,11 @@
-import { serialize, Observer } from "Tools";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FlyCamera } from "Cameras";
-import { PointerInfo, PointerEventTypes } from "Events";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FlyCamera } from "Cameras/flyCamera";
+import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
 import { Scene } from "scene";
-import { Quaternion, Axis } from "Math";
+import { Quaternion, Axis } from "Math/math";
     /**
      * Listen to mouse events to control the camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Inputs/freeCameraDeviceOrientationInput.ts

@@ -1,7 +1,8 @@
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { Quaternion } from "Math";
-import { Tools } from "index";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { Quaternion } from "Math/math";
+import { Tools } from "Tools/tools";
     /**
      * Takes information about the orientation of the device as reported by the deviceorientation event to orient the camera.
      * Screen rotation is taken into account.

src/Cameras/Inputs/freeCameraGamepadInput.ts

@@ -1,8 +1,10 @@
-import { serialize, Observer } from "Tools";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { Matrix, Vector3, Vector2 } from "Math";
-import { Gamepad } from "Gamepad";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { Matrix, Vector3, Vector2 } from "Math/math";
+import { Gamepad } from "Gamepad/gamepad";
 
     /**
      * Manage the gamepad inputs to control a free camera.

src/Cameras/Inputs/freeCameraKeyboardMoveInput.ts

@@ -1,10 +1,12 @@
-import { serialize, Observer } from "Tools";
+import { serialize } from "Tools/decorators";
+import { Observer } from "Tools/observable";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { KeyboardInfo, KeyboardEventTypes } from "Events";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { KeyboardInfo, KeyboardEventTypes } from "Events/keyboardEvents";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Engine } from "Engine";
+import { Vector3 } from "Math/math";
+import { Engine } from "Engine/engine";
     /**
      * Manage the keyboard inputs to control the movement of a free camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Inputs/freeCameraMouseInput.ts

@@ -1,7 +1,9 @@
-import { serialize, Observer, EventState } from "Tools";
+import { Observer, EventState } from "Tools/observable";
+import { serialize } from "Tools/decorators";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { PointerInfo, PointerEventTypes } from "Events";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
     /**
      * Manage the mouse inputs to control the movement of a free camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Inputs/freeCameraTouchInput.ts

@@ -1,8 +1,10 @@
-import { serialize, Observer, EventState } from "Tools";
+import { serialize } from "Tools/decorators";
+import { Observer, EventState } from "Tools/observable";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { PointerInfo, PointerEventTypes } from "Events";
-import { Matrix, Vector3 } from "Math";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { PointerInfo, PointerEventTypes } from "Events/pointerEvents";
+import { Matrix, Vector3 } from "Math/math";
     /**
      * Manage the touch inputs to control the movement of a free camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Inputs/freeCameraVirtualJoystickInput.ts

@@ -1,7 +1,8 @@
-import { VirtualJoystick, JoystickAxis } from "Tools";
+import { VirtualJoystick, JoystickAxis } from "Tools/virtualJoystick";
 import { Nullable } from "types";
-import { ICameraInput, CameraInputTypes, FreeCamera } from "Cameras";
-import { Matrix, Vector3 } from "Math";
+import { ICameraInput, CameraInputTypes } from "Cameras/cameraInputsManager";
+import { FreeCamera } from "Cameras/freeCamera";
+import { Matrix, Vector3 } from "Math/math";
     /**
      * Manage the Virtual Joystick inputs to control the movement of a free camera.
      * @see http://doc.babylonjs.com/how_to/customizing_camera_inputs

src/Cameras/Stereoscopic/anaglyphArcRotateCamera.ts

@@ -1,7 +1,8 @@
-import { ArcRotateCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("AnaglyphArcRotateCamera", (name, scene, options) => {
         return () => new AnaglyphArcRotateCamera(name, 0, 0, 1.0, Vector3.Zero(), options.interaxial_distance, scene);

src/Cameras/Stereoscopic/anaglyphFreeCamera.ts

@@ -1,7 +1,8 @@
-import { FreeCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { FreeCamera } from "Cameras/freeCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("AnaglyphFreeCamera", (name, scene, options) => {
         return () => new AnaglyphFreeCamera(name, Vector3.Zero(), options.interaxial_distance, scene);

src/Cameras/Stereoscopic/anaglyphGamepadCamera.ts

@@ -1,7 +1,8 @@
-import { GamepadCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { GamepadCamera } from "Cameras/gamepadCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("AnaglyphGamepadCamera", (name, scene, options) => {
         return () => new AnaglyphGamepadCamera(name, Vector3.Zero(), options.interaxial_distance, scene);

src/Cameras/Stereoscopic/anaglyphUniversalCamera.ts

@@ -1,7 +1,8 @@
-import { UniversalCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { UniversalCamera } from "Cameras/universalCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("AnaglyphUniversalCamera", (name, scene, options) => {
         return () => new AnaglyphUniversalCamera(name, Vector3.Zero(), options.interaxial_distance, scene);

src/Cameras/Stereoscopic/stereoscopicArcRotateCamera.ts

@@ -1,7 +1,8 @@
-import { ArcRotateCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("StereoscopicArcRotateCamera", (name, scene, options) => {
         return () => new StereoscopicArcRotateCamera(name, 0, 0, 1.0, Vector3.Zero(), options.interaxial_distance, options.isStereoscopicSideBySide, scene);

src/Cameras/Stereoscopic/stereoscopicFreeCamera.ts

@@ -1,7 +1,8 @@
-import { FreeCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { FreeCamera } from "Cameras/freeCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("StereoscopicFreeCamera", (name, scene, options) => {
         return () => new StereoscopicFreeCamera(name, Vector3.Zero(), options.interaxial_distance, options.isStereoscopicSideBySide, scene);

src/Cameras/Stereoscopic/stereoscopicGamepadCamera.ts

@@ -1,7 +1,8 @@
-import { GamepadCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { GamepadCamera } from "Cameras/gamepadCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("StereoscopicGamepadCamera", (name, scene, options) => {
         return () => new StereoscopicGamepadCamera(name, Vector3.Zero(), options.interaxial_distance, options.isStereoscopicSideBySide, scene);

src/Cameras/Stereoscopic/stereoscopicUniversalCamera.ts

@@ -1,7 +1,9 @@
-import { UniversalCamera, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { UniversalCamera } from "Cameras/universalCamera";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
+
     Node.AddNodeConstructor("StereoscopicFreeCamera", (name, scene, options) => {
         return () => new StereoscopicUniversalCamera(name, Vector3.Zero(), options.interaxial_distance, options.isStereoscopicSideBySide, scene);
     });

src/Cameras/VR/vrCameraMetrics.ts

@@ -1,4 +1,4 @@
-import { Matrix } from "Math";
+import { Matrix } from "Math/math";
     /**
      * This represents all the required metrics to create a VR camera.
      * @see http://doc.babylonjs.com/babylon101/cameras#device-orientation-camera

src/Cameras/VR/vrDeviceOrientationArcRotateCamera.ts

@@ -1,7 +1,9 @@
-import { ArcRotateCamera, VRCameraMetrics, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { ArcRotateCamera } from "Cameras/arcRotateCamera";
+import { VRCameraMetrics } from "./vrCameraMetrics";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("VRDeviceOrientationFreeCamera", (name, scene) => {
         return () => new VRDeviceOrientationArcRotateCamera(name, 0, 0, 1.0, Vector3.Zero(), scene);

src/Cameras/VR/vrDeviceOrientationFreeCamera.ts

@@ -1,7 +1,9 @@
-import { DeviceOrientationCamera, VRCameraMetrics, Camera } from "Cameras";
+import { Camera } from "Cameras/camera";
+import { DeviceOrientationCamera } from "Cameras/deviceOrientationCamera";
+import { VRCameraMetrics } from "./vrCameraMetrics";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("VRDeviceOrientationFreeCamera", (name, scene) => {
         return () => new VRDeviceOrientationFreeCamera(name, Vector3.Zero(), scene);

src/Cameras/VR/vrDeviceOrientationGamepadCamera.ts

@@ -1,7 +1,8 @@
-import { VRCameraMetrics, VRDeviceOrientationFreeCamera } from "Cameras";
+import { VRDeviceOrientationFreeCamera } from "./vrDeviceOrientationFreeCamera";
+import { VRCameraMetrics } from "./vrCameraMetrics";
 import { Scene } from "scene";
-import { Vector3 } from "Math";
-import { Node } from "Node";
+import { Vector3 } from "Math/math";
+import { Node } from "node";
 
     Node.AddNodeConstructor("VRDeviceOrientationGamepadCamera", (name, scene) => {
         return () => new VRDeviceOrientationGamepadCamera(name, Vector3.Zero(), scene);

src/Cameras/VR/vrExperienceHelper.ts

@@ -1,17 +1,32 @@
-import { Observer, Observable, Tools } from "Tools";
+import { Tools } from "Tools/tools";
+import { Observer, Observable } from "Tools/observable";
 import { Nullable } from "types";
-import { FreeCamera, DeviceOrientationCamera, Camera, VRDeviceOrientationFreeCamera, WebVROptions, WebVRFreeCamera, TargetCamera } from "Cameras";
-import { PointerEventTypes } from "Events";
+import { Camera } from "Cameras/camera";
+import { FreeCamera } from "Cameras/freeCamera";
+import { TargetCamera } from "Cameras/targetCamera";
+import { DeviceOrientationCamera } from "Cameras/deviceOrientationCamera";
+import { VRDeviceOrientationFreeCamera } from "Cameras/VR/vrDeviceOrientationFreeCamera";
+import { WebVROptions, WebVRFreeCamera } from "Cameras/VR/webVRCamera";
+import { PointerEventTypes } from "Events/pointerEvents";
 import { Scene, IDisposable } from "scene";
-import { Quaternion, Matrix, Vector3, Color3, Color4, Axis } from "Math";
-import { Gamepad, WebVRController, PoseEnabledController, Xbox360Pad, Xbox360Button, StickValues, PoseEnabledControllerType } from "Gamepad";
-import { IDisplayChangedEventArgs } from "Engine";
-import { Mesh, AbstractMesh, TransformNode } from "Mesh";
-import { PickingInfo } from "Collisions";
-import { Ray } from "Culling";
-import { StandardMaterial, ImageProcessingConfiguration, DynamicTexture } from "Materials";
-import { ImageProcessingPostProcess } from "PostProcess";
-import { Animation, SineEase, EasingFunction, CircleEase } from "Animations";
+import { Quaternion, Matrix, Vector3, Color3, Color4, Axis } from "Math/math";
+import { Gamepad, StickValues } from "Gamepad/gamepad";
+import { PoseEnabledController, PoseEnabledControllerType } from "Gamepad/Controllers/poseEnabledController";
+import { WebVRController } from "Gamepad/Controllers/webVRController";
+import { Xbox360Pad, Xbox360Button } from "Gamepad/xboxGamepad";
+import { IDisplayChangedEventArgs } from "Engine/engine";
+import { AbstractMesh } from "Mesh/abstractMesh";
+import { TransformNode } from "Mesh/transformNode";
+import { Mesh } from "Mesh/mesh";
+import { PickingInfo } from "Collisions/pickingInfo";
+import { Ray } from "Culling/ray";
+import { ImageProcessingConfiguration } from "Materials/imageProcessingConfiguration";
+import { StandardMaterial } from "Materials/standardMaterial";
+import { DynamicTexture } from "Materials/Textures/dynamicTexture";
+import { ImageProcessingPostProcess } from "PostProcess/imageProcessingPostProcess";
+import { SineEase, EasingFunction, CircleEase } from "Animations/easing";
+import { Animation } from "Animations/animation";
+
     /**
      * Options to modify the vr teleportation behavior.
      */

src/Cameras/VR/webVRCamera.ts

@@ -1,14 +1,18 @@
-import { Observer, Observable } from "Tools";
 import { Nullable } from "types";
-import { FreeCamera, Camera, WebVROptions, TargetCamera } from "Cameras";
+import { Observer, Observable } from "Tools/observable";
+import { FreeCamera } from "Cameras/freeCamera";
+import { TargetCamera } from "Cameras/targetCamera";
+import { Camera } from "Cameras/camera";
 import { Scene } from "scene";
-import { Quaternion, Matrix, Vector3 } from "Math";
-import { Gamepad, WebVRController, PoseEnabledControllerType } from "Gamepad";
-import { IDisplayChangedEventArgs } from "Engine";
-import { Node } from "Node";
-import { AbstractMesh } from "Mesh";
-import { Ray } from "Culling";
-import { HemisphericLight } from "Lights";
+import { Quaternion, Matrix, Vector3 } from "Math/math";
+import { Gamepad } from "Gamepad/gamepad";
+import { PoseEnabledControllerType } from "Gamepad/Controllers/poseEnabledController";
+import { WebVRController } from "Gamepad/Controllers/webVRController";
+import { IDisplayChangedEventArgs } from "Engine/engine";
+import { Node } from "node";
+import { AbstractMesh } from "Mesh/abstractMesh";
+import { Ray } from "Culling/ray";
+import { HemisphericLight } from "Lights/hemisphericLight";
     Node.AddNodeConstructor("WebVRFreeCamera", (name, scene) => {
         return () => new WebVRFreeCamera(name, Vector3.Zero(), scene);
     });

src/Cameras/XR/webXRCamera.ts

@@ -1,6 +1,9 @@
-import { FreeCamera, WebXRSessionManager, Camera, TargetCamera } from "Cameras";
-import { Vector3, Matrix, Quaternion, Viewport } from "Math";
+import { Vector3, Matrix, Quaternion, Viewport } from "Math/math";
 import { Scene } from "scene";
+import { Camera } from "Cameras/camera";
+import { FreeCamera } from "Cameras/freeCamera";
+import { TargetCamera } from "Cameras/targetCamera";
+import { WebXRSessionManager } from "./webXRSessionManager";
 
     /**
      * WebXR Camera which holds the views for the xrSession

src/Cameras/XR/webXREnterExitUI.ts

@@ -1,7 +1,7 @@
 import { Nullable } from "types";
-import { WebXRExperienceHelper, WebXRState } from "Cameras";
+import { Observable } from "Tools/observable";
 import { IDisposable, Scene } from "scene";
-import { Observable } from "Tools";
+import { WebXRExperienceHelper, WebXRState } from "./webXRExperienceHelper";
     /**
      * Button which can be used to enter a different mode of XR
      */

src/Cameras/XR/webXRExperienceHelper.ts

@@ -1,10 +1,12 @@
-import { Observable } from "Tools";
 import { Nullable } from "types";
-import { Camera, WebXRSessionManager, WebXRCamera } from "Cameras";
+import { Observable } from "Tools/observable";
 import { IDisposable, Scene } from "scene";
-import { Quaternion, Vector3 } from "Math";
-import { AbstractMesh } from "Mesh";
-import { Ray } from "Culling";
+import { Quaternion, Vector3 } from "Math/math";
+import { AbstractMesh } from "Mesh/abstractMesh";
+import { Ray } from "Culling/ray";
+import { Camera } from "Cameras/camera";
+import { WebXRSessionManager } from "./webXRSessionManager";
+import { WebXRCamera } from "./webXRCamera";
     /**
      * States of the webXR experience
      */

src/Cameras/XR/webXRInput.ts

@@ -1,9 +1,9 @@
-import { Observer } from "Tools";
 import { Nullable } from "types";
-import { WebXRExperienceHelper } from "Cameras";
+import { Observer } from "Tools/observable";
+import { Matrix, Quaternion } from "Math/math";
 import { IDisposable, Scene } from "scene";
-import { AbstractMesh } from "Mesh";
-import { Matrix, Quaternion } from "Math";
+import { AbstractMesh } from "Mesh/abstractMesh";
+import { WebXRExperienceHelper } from "./webXRExperienceHelper";
     /**
      * Represents an XR input
      */

src/Cameras/XR/webXRManagedOutputCanvas.ts

@@ -1,6 +1,6 @@
 import { Nullable } from "types";
-import { WebXRExperienceHelper, WebXRState } from "Cameras";
 import { IDisposable } from "scene";
+import { WebXRExperienceHelper, WebXRState } from "./webXRExperienceHelper";
     /**
      * Creates a canvas that is added/removed from the webpage when entering/exiting XR
      */

src/Cameras/XR/webXRSessionManager.ts

@@ -1,9 +1,11 @@
-import { Observable, Tools } from "Tools";
+import { Tools } from "Tools/tools";
+import { Observable } from "Tools/observable";
 import { Nullable } from "types";
 import { IDisposable, Scene } from "scene";
-import { Vector3, Matrix } from "Math";
-import { RenderTargetTexture, InternalTexture } from "Materials";
-import { Ray } from "Culling";
+import { Vector3, Matrix } from "Math/math";
+import { InternalTexture } from "Materials/Textures/internalTexture";
+import { RenderTargetTexture } from "Materials/Textures/renderTargetTexture";
+import { Ray } from "Culling/ray";
     /**
      * Manages an XRSession
      * @see https://doc.babylonjs.com/how_to/webxr