from nmigen.cli import main, verilog
from math import log
-from fpbase import FPNumIn, FPNumOut, FPOpIn, Overflow, FPBase, FPNumBase
-from fpbase import MultiShiftRMerge, Trigger
+from ieee754.fpcommon.fpbase import FPNumIn, FPNumOut, FPOpIn, Overflow, FPBase, FPNumBase
+from ieee754.fpcommon.fpbase import MultiShiftRMerge, Trigger
from nmutil.singlepipe import (ControlBase, StageChain, SimpleHandshake,
PassThroughStage, PrevControl)
from nmutil.multipipe import CombMuxOutPipe
from nmutil.multipipe import PriorityCombMuxInPipe
-from fpbase import FPState
+from ieee754.fpcommon.fpbase import FPState
from nmutil import nmoperator