remove ob

contracts/dance/SeedDance.sol

@@ -1,8 +1,6 @@
 // SPDX-License-Identifier: CAL
 pragma solidity ^0.8.18;
 
-import "../math/LibFixedPointMath.sol";
-
 /// Represents a minimum and maximum duration for the dance in a structure that
 /// can fit in a single slot. uint32 representation for timestamps is inline
 /// with the rest of the rain protocol.
@@ -187,7 +185,6 @@ library LibCommitment {
 /// would be very likely to be hashed into something else that the miner cannot
 /// control or predict.
 contract SeedDance {
-    using LibFixedPointMath for uint256;
     using LibCommitment for Commitment;
 
     /// The dance has started.

contracts/factory/CloneFactory.sol

@@ -3,7 +3,7 @@ pragma solidity =0.8.19;
 
 import "rain.interface.factory/ICloneableV1.sol";
 import "rain.interface.factory/ICloneFactoryV1.sol";
-import "../interpreter/deploy/DeployerDiscoverableMetaV1.sol";
+import "rain.interface.interpreter/deployerDiscoverable/DeployerDiscoverableMetaV1.sol";
 import {ClonesUpgradeable as Clones} from "@openzeppelin/contracts-upgradeable/proxy/ClonesUpgradeable.sol";
 
 /// Thrown when an implementation is the zero address which is always a mistake.

contracts/flow/FlowCommon.sol

@@ -8,7 +8,7 @@ import "rain.interface.interpreter/IInterpreterV1.sol";
 import "rain.interface.interpreter/LibEncodedDispatch.sol";
 import "rain.interface.interpreter/LibContext.sol";
 import "rain.lib.interpreter/LibInterpreterState.sol";
-import "../interpreter/deploy/DeployerDiscoverableMetaV1.sol";
+import "rain.interface.interpreter/deployerDiscoverable/DeployerDiscoverableMetaV1.sol";
 import "rain.interface.interpreter/LibEvaluable.sol";
 
 import "@openzeppelin/contracts-upgradeable/proxy/utils/Initializable.sol";

contracts/flow/erc20/FlowERC20.sol

@@ -11,10 +11,10 @@ import "rain.interface.interpreter/LibEncodedDispatch.sol";
 import "rain.interface.factory/ICloneableV1.sol";
 import "rain.interface.flow/IFlowERC20V3.sol";
 import "sol.lib.memory/LibStackSentinel.sol";
+import "rain.math.fixedpoint/FixedPointDecimalArithmeticOpenZeppelin.sol";
 
 import {AllStandardOps} from "../../interpreter/ops/AllStandardOps.sol";
 import "../libraries/LibFlow.sol";
-import "../../math/LibFixedPointMath.sol";
 import "../FlowCommon.sol";
 
 bytes32 constant CALLER_META_HASH = bytes32(
@@ -43,7 +43,7 @@ contract FlowERC20 is
     using LibUint256Array for uint256;
     using LibUint256Array for uint256[];
     using LibUint256Matrix for uint256[];
-    using LibFixedPointMath for uint256;
+    using FixedPointDecimalArithmeticOpenZeppelin for uint256;
 
     bool private evalHandleTransfer;
     Evaluable internal evaluable;

contracts/flow/erc721/FlowERC721.sol

@@ -12,10 +12,10 @@ import "sol.lib.memory/LibStackSentinel.sol";
 import "rain.interface.interpreter/LibEncodedDispatch.sol";
 import "rain.interface.factory/ICloneableV1.sol";
 import "rain.interface.flow/IFlowERC721V3.sol";
+import "rain.math.fixedpoint/FixedPointDecimalArithmeticOpenZeppelin.sol";
 
 import {AllStandardOps} from "../../interpreter/ops/AllStandardOps.sol";
 import "../libraries/LibFlow.sol";
-import "../../math/LibFixedPointMath.sol";
 import "../FlowCommon.sol";
 
 /// Thrown when burner of tokens is not the owner of tokens.
@@ -49,7 +49,7 @@ contract FlowERC721 is
     using LibUint256Array for uint256;
     using LibUint256Array for uint256[];
     using LibUint256Matrix for uint256[];
-    using LibFixedPointMath for uint256;
+    using FixedPointDecimalArithmeticOpenZeppelin for uint256;
     using LibStackSentinel for Pointer;
 
     bool private evalHandleTransfer;

contracts/lobby/Lobby.sol

@@ -9,18 +9,17 @@ import "rain.interface.interpreter/LibEncodedDispatch.sol";
 import "sol.lib.memory/LibStackPointer.sol";
 import "rain.interface.interpreter/LibContext.sol";
 import "rain.interface.interpreter/IInterpreterCallerV2.sol";
-import "../interpreter/deploy/DeployerDiscoverableMetaV1.sol";
+import "rain.interface.interpreter/deployerDiscoverable/DeployerDiscoverableMetaV1.sol";
 import "rain.interface.interpreter/LibEvaluable.sol";
 import "rain.math.saturating/SaturatingMath.sol";
-import "../math/LibFixedPointMath.sol";
+import "rain.math.fixedpoint/FixedPointDecimalArithmeticOpenZeppelin.sol";
 import "rain.interface.factory/ICloneableV1.sol";
 import "sol.lib.memory/LibUint256Matrix.sol";
 
 import "../phased/Phased.sol";
 import {ReentrancyGuardUpgradeable as ReentrancyGuard} from "@openzeppelin/contracts-upgradeable/security/ReentrancyGuardUpgradeable.sol";
 import {IERC20Upgradeable as IERC20} from "@openzeppelin/contracts-upgradeable/token/ERC20/IERC20Upgradeable.sol";
 import {SafeERC20Upgradeable as SafeERC20} from "@openzeppelin/contracts-upgradeable/token/ERC20/utils/SafeERC20Upgradeable.sol";
-import {MathUpgradeable as Math} from "@openzeppelin/contracts-upgradeable/utils/math/MathUpgradeable.sol";
 
 /// Thrown when a result hash already exists but the lobby is attempting to move
 /// to complete from pending.
@@ -143,7 +142,7 @@ contract Lobby is
     using LibStackPointer for Pointer;
     using Math for uint256;
     using SaturatingMath for uint256;
-    using LibFixedPointMath for uint256;
+    using FixedPointDecimalArithmeticOpenZeppelin for uint256;
 
     event Initialize(address sender, LobbyConfig config);