#from nmigen.cli import main, verilog
-from singlepipe import StageChain, SimpleHandshake
+from nmutil.singlepipe import StageChain, SimpleHandshake
-from fpbase import FPState, FPID
+from ieee754.fpcommon.fpbase import FPState, FPID
from .postcalc import FPAddStage1Data
from .postnormalise import FPNorm1ModSingle
from .roundz import FPRoundMod