diff --git a/hdk/common/build/checkpoints/from_aws/README b/hdk/common/shell_current/build/checkpoints/from_aws/README
similarity index 100%
rename from hdk/common/build/checkpoints/from_aws/README
rename to hdk/common/shell_current/build/checkpoints/from_aws/README
diff --git a/hdk/common/build/checkpoints/from_aws/SH_CL_BB_routed.dcp b/hdk/common/shell_current/build/checkpoints/from_aws/SH_CL_BB_routed.dcp
similarity index 100%
rename from hdk/common/build/checkpoints/from_aws/SH_CL_BB_routed.dcp
rename to hdk/common/shell_current/build/checkpoints/from_aws/SH_CL_BB_routed.dcp
diff --git a/hdk/common/build/constraints/cl_clocks_aws.xdc b/hdk/common/shell_current/build/constraints/cl_clocks_aws.xdc
similarity index 100%
rename from hdk/common/build/constraints/cl_clocks_aws.xdc
rename to hdk/common/shell_current/build/constraints/cl_clocks_aws.xdc
diff --git a/hdk/common/build/constraints/cl_pnr_aws.xdc b/hdk/common/shell_current/build/constraints/cl_pnr_aws.xdc
similarity index 100%
rename from hdk/common/build/constraints/cl_pnr_aws.xdc
rename to hdk/common/shell_current/build/constraints/cl_pnr_aws.xdc
diff --git a/hdk/common/build/constraints/cl_synth_aws.xdc b/hdk/common/shell_current/build/constraints/cl_synth_aws.xdc
similarity index 100%
rename from hdk/common/build/constraints/cl_synth_aws.xdc
rename to hdk/common/shell_current/build/constraints/cl_synth_aws.xdc
diff --git a/hdk/common/build/scripts/device_type.tcl b/hdk/common/shell_current/build/scripts/device_type.tcl
similarity index 100%
rename from hdk/common/build/scripts/device_type.tcl
rename to hdk/common/shell_current/build/scripts/device_type.tcl
diff --git a/hdk/common/build/scripts/fail_fast.tcl b/hdk/common/shell_current/build/scripts/fail_fast.tcl
similarity index 100%
rename from hdk/common/build/scripts/fail_fast.tcl
rename to hdk/common/shell_current/build/scripts/fail_fast.tcl
diff --git a/hdk/common/build/scripts/vivado_keyfile.txt b/hdk/common/shell_current/build/scripts/vivado_keyfile.txt
similarity index 100%
rename from hdk/common/build/scripts/vivado_keyfile.txt
rename to hdk/common/shell_current/build/scripts/vivado_keyfile.txt
diff --git a/hdk/common/design/lib/axi4_ccf.sv b/hdk/common/shell_current/design/lib/axi4_ccf.sv
similarity index 100%
rename from hdk/common/design/lib/axi4_ccf.sv
rename to hdk/common/shell_current/design/lib/axi4_ccf.sv
diff --git a/hdk/common/design/lib/axi4_flop_fifo.sv b/hdk/common/shell_current/design/lib/axi4_flop_fifo.sv
similarity index 100%
rename from hdk/common/design/lib/axi4_flop_fifo.sv
rename to hdk/common/shell_current/design/lib/axi4_flop_fifo.sv
diff --git a/hdk/common/design/lib/bram_1rw.sv b/hdk/common/shell_current/design/lib/bram_1rw.sv
similarity index 100%
rename from hdk/common/design/lib/bram_1rw.sv
rename to hdk/common/shell_current/design/lib/bram_1rw.sv
diff --git a/hdk/common/design/lib/bram_2rw.sv b/hdk/common/shell_current/design/lib/bram_2rw.sv
similarity index 100%
rename from hdk/common/design/lib/bram_2rw.sv
rename to hdk/common/shell_current/design/lib/bram_2rw.sv
diff --git a/hdk/common/design/lib/ccf_ctl.v b/hdk/common/shell_current/design/lib/ccf_ctl.v
similarity index 100%
rename from hdk/common/design/lib/ccf_ctl.v
rename to hdk/common/shell_current/design/lib/ccf_ctl.v
diff --git a/hdk/common/design/lib/flop_ccf.sv b/hdk/common/shell_current/design/lib/flop_ccf.sv
similarity index 100%
rename from hdk/common/design/lib/flop_ccf.sv
rename to hdk/common/shell_current/design/lib/flop_ccf.sv
diff --git a/hdk/common/design/lib/flop_fifo.sv b/hdk/common/shell_current/design/lib/flop_fifo.sv
similarity index 100%
rename from hdk/common/design/lib/flop_fifo.sv
rename to hdk/common/shell_current/design/lib/flop_fifo.sv
diff --git a/hdk/common/design/lib/flop_fifo_in.sv b/hdk/common/shell_current/design/lib/flop_fifo_in.sv
similarity index 100%
rename from hdk/common/design/lib/flop_fifo_in.sv
rename to hdk/common/shell_current/design/lib/flop_fifo_in.sv
diff --git a/hdk/common/design/lib/gray.inc b/hdk/common/shell_current/design/lib/gray.inc
similarity index 100%
rename from hdk/common/design/lib/gray.inc
rename to hdk/common/shell_current/design/lib/gray.inc
diff --git a/hdk/common/design/lib/lib_pipe.sv b/hdk/common/shell_current/design/lib/lib_pipe.sv
similarity index 100%
rename from hdk/common/design/lib/lib_pipe.sv
rename to hdk/common/shell_current/design/lib/lib_pipe.sv
diff --git a/hdk/common/design/lib/pulse2lvl.sv b/hdk/common/shell_current/design/lib/pulse2lvl.sv
similarity index 100%
rename from hdk/common/design/lib/pulse2lvl.sv
rename to hdk/common/shell_current/design/lib/pulse2lvl.sv
diff --git a/hdk/common/design/lib/push_2_fifo.sv b/hdk/common/shell_current/design/lib/push_2_fifo.sv
similarity index 100%
rename from hdk/common/design/lib/push_2_fifo.sv
rename to hdk/common/shell_current/design/lib/push_2_fifo.sv
diff --git a/hdk/common/design/lib/push_2_fifo_guts.inc b/hdk/common/shell_current/design/lib/push_2_fifo_guts.inc
similarity index 100%
rename from hdk/common/design/lib/push_2_fifo_guts.inc
rename to hdk/common/shell_current/design/lib/push_2_fifo_guts.inc
diff --git a/hdk/common/design/lib/sync.v b/hdk/common/shell_current/design/lib/sync.v
similarity index 100%
rename from hdk/common/design/lib/sync.v
rename to hdk/common/shell_current/design/lib/sync.v
diff --git a/hdk/common/shell_latest b/hdk/common/shell_latest
new file mode 120000
index 000000000..4ba4ed74e
--- /dev/null
+++ b/hdk/common/shell_latest
@@ -0,0 +1 @@
+shell_current
\ No newline at end of file