from nmigen import Module, Const, Signal, Array, Cat, Elaboratable
from regfile.regfile import RegFileArray, treereduce
-from scoreboard.global_pending import GlobalPending
-from scoreboard.group_picker import GroupPicker
-from scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
-from scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
-from scoreboard.memfu import MemFunctionUnits
+from soc.scoreboard.global_pending import GlobalPending
+from soc.scoreboard.group_picker import GroupPicker
+from soc.scoreboard.issue_unit import IssueUnitGroup, IssueUnitArray, RegDecode
+from soc.scoreboard.shadow import ShadowMatrix, BranchSpeculationRecord
+from soc.scoreboard.memfu import MemFunctionUnits
from nmutil.latch import SRLatch
from nmutil.nmoperator import eq