diff --git a/wally-pipelined/src/privileged/csrc.sv b/wally-pipelined/src/privileged/csrc.sv
index 97eefb80..ad8ddebf 100644
--- a/wally-pipelined/src/privileged/csrc.sv
+++ b/wally-pipelined/src/privileged/csrc.sv
@@ -93,8 +93,8 @@ module csrc #(parameter
   generate
     if (`ZICOUNTERS_SUPPORTED) begin:counters
      (* mark_debug = "true" *) logic [63:0] CYCLE_REGW, INSTRET_REGW;
-     logic [63:0] CYCLEPlusM, INSTRETPlusM;
-       logic [`XLEN-1:0] NextCYCLEM, NextINSTRETM;
+      logic [63:0] CYCLEPlusM, INSTRETPlusM;
+      logic [`XLEN-1:0] NextCYCLEM, NextINSTRETM;
       logic        WriteCYCLEM, WriteINSTRETM;
       logic [4:0]  CounterNumM;
       logic [`XLEN-1:0] HPMCOUNTER_REGW [`COUNTERS-1:3];
diff --git a/wally-pipelined/src/sdc/SDC.sv b/wally-pipelined/src/uncore/sdc/SDC.sv
similarity index 100%
rename from wally-pipelined/src/sdc/SDC.sv
rename to wally-pipelined/src/uncore/sdc/SDC.sv
diff --git a/wally-pipelined/src/sdc/SDCcounter.sv b/wally-pipelined/src/uncore/sdc/SDCcounter.sv
similarity index 100%
rename from wally-pipelined/src/sdc/SDCcounter.sv
rename to wally-pipelined/src/uncore/sdc/SDCcounter.sv
diff --git a/wally-pipelined/src/sdc/clkdivider.sv b/wally-pipelined/src/uncore/sdc/clkdivider.sv
similarity index 100%
rename from wally-pipelined/src/sdc/clkdivider.sv
rename to wally-pipelined/src/uncore/sdc/clkdivider.sv
diff --git a/wally-pipelined/src/sdc/crc16_sipo_np_ce.sv b/wally-pipelined/src/uncore/sdc/crc16_sipo_np_ce.sv
similarity index 100%
rename from wally-pipelined/src/sdc/crc16_sipo_np_ce.sv
rename to wally-pipelined/src/uncore/sdc/crc16_sipo_np_ce.sv
diff --git a/wally-pipelined/src/sdc/crc7_pipo.sv b/wally-pipelined/src/uncore/sdc/crc7_pipo.sv
similarity index 100%
rename from wally-pipelined/src/sdc/crc7_pipo.sv
rename to wally-pipelined/src/uncore/sdc/crc7_pipo.sv
diff --git a/wally-pipelined/src/sdc/crc7_sipo_np_ce.sv b/wally-pipelined/src/uncore/sdc/crc7_sipo_np_ce.sv
similarity index 100%
rename from wally-pipelined/src/sdc/crc7_sipo_np_ce.sv
rename to wally-pipelined/src/uncore/sdc/crc7_sipo_np_ce.sv
diff --git a/wally-pipelined/src/sdc/piso_generic_ce.sv b/wally-pipelined/src/uncore/sdc/piso_generic_ce.sv
similarity index 100%
rename from wally-pipelined/src/sdc/piso_generic_ce.sv
rename to wally-pipelined/src/uncore/sdc/piso_generic_ce.sv
diff --git a/wally-pipelined/src/sdc/regfile_p2r1w1_nibo.sv b/wally-pipelined/src/uncore/sdc/regfile_p2r1w1_nibo.sv
similarity index 100%
rename from wally-pipelined/src/sdc/regfile_p2r1w1_nibo.sv
rename to wally-pipelined/src/uncore/sdc/regfile_p2r1w1_nibo.sv
diff --git a/wally-pipelined/src/sdc/regfile_p2r1w1bwen.sv b/wally-pipelined/src/uncore/sdc/regfile_p2r1w1bwen.sv
similarity index 100%
rename from wally-pipelined/src/sdc/regfile_p2r1w1bwen.sv
rename to wally-pipelined/src/uncore/sdc/regfile_p2r1w1bwen.sv
diff --git a/wally-pipelined/src/sdc/sd_clk_fsm.sv b/wally-pipelined/src/uncore/sdc/sd_clk_fsm.sv
similarity index 100%
rename from wally-pipelined/src/sdc/sd_clk_fsm.sv
rename to wally-pipelined/src/uncore/sdc/sd_clk_fsm.sv
diff --git a/wally-pipelined/src/sdc/sd_cmd_fsm.sv b/wally-pipelined/src/uncore/sdc/sd_cmd_fsm.sv
similarity index 100%
rename from wally-pipelined/src/sdc/sd_cmd_fsm.sv
rename to wally-pipelined/src/uncore/sdc/sd_cmd_fsm.sv
diff --git a/wally-pipelined/src/sdc/sd_dat_fsm.sv b/wally-pipelined/src/uncore/sdc/sd_dat_fsm.sv
similarity index 100%
rename from wally-pipelined/src/sdc/sd_dat_fsm.sv
rename to wally-pipelined/src/uncore/sdc/sd_dat_fsm.sv
diff --git a/wally-pipelined/src/sdc/sd_top.sv b/wally-pipelined/src/uncore/sdc/sd_top.sv
similarity index 100%
rename from wally-pipelined/src/sdc/sd_top.sv
rename to wally-pipelined/src/uncore/sdc/sd_top.sv
diff --git a/wally-pipelined/src/sdc/sd_top_wrapper.v b/wally-pipelined/src/uncore/sdc/sd_top_wrapper.v
similarity index 100%
rename from wally-pipelined/src/sdc/sd_top_wrapper.v
rename to wally-pipelined/src/uncore/sdc/sd_top_wrapper.v
diff --git a/wally-pipelined/src/sdc/simple_timer.sv b/wally-pipelined/src/uncore/sdc/simple_timer.sv
similarity index 100%
rename from wally-pipelined/src/sdc/simple_timer.sv
rename to wally-pipelined/src/uncore/sdc/simple_timer.sv
diff --git a/wally-pipelined/src/sdc/sipo_generic_ce.sv b/wally-pipelined/src/uncore/sdc/sipo_generic_ce.sv
similarity index 100%
rename from wally-pipelined/src/sdc/sipo_generic_ce.sv
rename to wally-pipelined/src/uncore/sdc/sipo_generic_ce.sv
diff --git a/wally-pipelined/src/sdc/up_down_counter.sv b/wally-pipelined/src/uncore/sdc/up_down_counter.sv
similarity index 100%
rename from wally-pipelined/src/sdc/up_down_counter.sv
rename to wally-pipelined/src/uncore/sdc/up_down_counter.sv