diff --git a/axi4_lite_registers/axi_lite/axi4_lite_driver_slave.svh b/axi_lite/axi4_lite_driver_slave.svh
similarity index 100%
rename from axi4_lite_registers/axi_lite/axi4_lite_driver_slave.svh
rename to axi_lite/axi4_lite_driver_slave.svh
diff --git a/axi4_lite_registers/axi_lite/axi4_lite_if.sv b/axi_lite/axi4_lite_if.sv
similarity index 100%
rename from axi4_lite_registers/axi_lite/axi4_lite_if.sv
rename to axi_lite/axi4_lite_if.sv
diff --git a/axi4_lite_registers/axi_lite/axi4_lite_pkg.sv b/axi_lite/axi4_lite_pkg.sv
similarity index 100%
rename from axi4_lite_registers/axi_lite/axi4_lite_pkg.sv
rename to axi_lite/axi4_lite_pkg.sv
diff --git a/axi4_lite_registers/axi_lite/modport.svh b/axi_lite/modport.svh
similarity index 100%
rename from axi4_lite_registers/axi_lite/modport.svh
rename to axi_lite/modport.svh
diff --git a/axi4_lite_registers/axi_lite/unit_test_pkg.sv b/axi_lite/unit_test_pkg.sv
similarity index 100%
rename from axi4_lite_registers/axi_lite/unit_test_pkg.sv
rename to axi_lite/unit_test_pkg.sv
diff --git a/quartus/qsys/arria10_hps/altera_arria10_interface_generator_140/synth/hps.pre.xml b/quartus/qsys/arria10_hps/altera_arria10_interface_generator_140/synth/hps.pre.xml
index 7618c2c6e0ebe89cede7c60eb5e56b2f57cf7a5d..80692bf98e90030410e77e031e2791970036f835 100644
--- a/quartus/qsys/arria10_hps/altera_arria10_interface_generator_140/synth/hps.pre.xml
+++ b/quartus/qsys/arria10_hps/altera_arria10_interface_generator_140/synth/hps.pre.xml
@@ -203,7 +203,7 @@
   </csr>
   <csr />
   <!-- This section was added by Quartus Prime Version 22.1std.2 Build 922 07/20/2023 SC Standard Edition -->
-  <!-- Generated on Tue Jul  2 16:36:36 2024 -->
+  <!-- Generated on Wed Jul  3 15:34:46 2024 -->
   <csr>
     <!-- OSC_CLK_1_HPS -->
     <config name='i_io48_pin_mux_dedicated_io_grp.configuration_dedicated_io_1.rtrim'        value='1' />
diff --git a/quartus/qsys/arria10_hps/synth/arria10_hps.qicache b/quartus/qsys/arria10_hps/synth/arria10_hps.qicache
index 63dfe5c546bf2b31ac7b99625178256c81df0501..7f163b09f08f37d114631c863cf959622f1f5787 100644
--- a/quartus/qsys/arria10_hps/synth/arria10_hps.qicache
+++ b/quartus/qsys/arria10_hps/synth/arria10_hps.qicache
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <qsys_generation_info>
-<qsys_file path="/rsa_project/jchomick/adtran_work/soc_system_v4_arria10/quartus/qsys/arria10_hps.qsys" />
-<gen_dir path="/rsa_project/jchomick/adtran_work/soc_system_v4_arria10/quartus/qsys/arria10_hps/" />
+<qsys_file path="/rsa_project/jchomick/adtran_work/fpga_groups_project/quartus/qsys/arria10_hps.qsys" />
+<gen_dir path="/rsa_project/jchomick/adtran_work/fpga_groups_project/quartus/qsys/arria10_hps/" />
 <user_regen_policy value="Never Regenerate Existing IP" />
 <actual_regen_policy value="Never Regenerate Existing IP" />
 <gen_action value="IP Generation Skipped" />
diff --git a/quartus/qsys/emif_a10_hps/synth/emif_a10_hps.qicache b/quartus/qsys/emif_a10_hps/synth/emif_a10_hps.qicache
index 9f91bd6cafdfd7fbce3333cf0d4e1f76e554c430..696fe09b3254143b2bc22aae189f6e9e70a8c91a 100644
--- a/quartus/qsys/emif_a10_hps/synth/emif_a10_hps.qicache
+++ b/quartus/qsys/emif_a10_hps/synth/emif_a10_hps.qicache
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='us-ascii'?>
 <qsys_generation_info>
-<qsys_file path="/rsa_project/jchomick/adtran_work/soc_system_v4_arria10/quartus/qsys/emif_a10_hps.qsys" />
-<gen_dir path="/rsa_project/jchomick/adtran_work/soc_system_v4_arria10/quartus/qsys/emif_a10_hps/" />
+<qsys_file path="/rsa_project/jchomick/adtran_work/fpga_groups_project/quartus/qsys/emif_a10_hps.qsys" />
+<gen_dir path="/rsa_project/jchomick/adtran_work/fpga_groups_project/quartus/qsys/emif_a10_hps/" />
 <user_regen_policy value="Never Regenerate Existing IP" />
 <actual_regen_policy value="Never Regenerate Existing IP" />
 <gen_action value="IP Generation Skipped" />
diff --git a/tests/modul_studenta_unit_test/modul_studenta_unit_test.sv b/tests/modul_studenta_unit_test/modul_studenta_unit_test.sv
index 4c13737a13972c210c085093f051d961796cad63..a5dec880d1fed0d488e51e2dfc0fdd20cfe5382a 100644
--- a/tests/modul_studenta_unit_test/modul_studenta_unit_test.sv
+++ b/tests/modul_studenta_unit_test/modul_studenta_unit_test.sv
@@ -1,6 +1,6 @@
 `timescale 1 ns / 1 ns
 
-`include "../../axi4_lite_registers/svunit_base/svunit_defines.svh"
+`include "../svunit_base/svunit_defines.svh"
 
 module modul_studenta_unit_test;
     import svunit_pkg::svunit_testcase;
diff --git a/tests/modul_studenta_unit_test/run.do b/tests/modul_studenta_unit_test/run.do
index 2c530803799993013d6984af8a76d02681661791..1c622a6c71791a9f4c0555482fe8bb085290364f 100755
--- a/tests/modul_studenta_unit_test/run.do
+++ b/tests/modul_studenta_unit_test/run.do
@@ -6,10 +6,10 @@ vmap work
 vlog -sv -work work {../../rdl/outputs/registers_pkg.sv}
 vlog -sv -work work {../../rdl/outputs/registers.sv}
 
-vlog -sv -work work {../../axi4_lite_registers/axi_lite/axi4_lite_pkg.sv}
-vlog -sv -work work {../../axi4_lite_registers/axi_lite/axi4_lite_if.sv}
+vlog -sv -work work {../../axi_lite/axi4_lite_pkg.sv}
+vlog -sv -work work {../../axi_lite/axi4_lite_if.sv}
 
-vlog -sv -work work {../../axi4_lite_registers/axi_lite/unit_test_pkg.sv}
+vlog -sv -work work {../../axi_lite/unit_test_pkg.sv}
 
 vlog -sv -work work {../../rtl/axi_ram/svunit_base/svunit_pkg.sv}
 
diff --git a/axi4_lite_registers/svunit_base/svunit_base.sv b/tests/svunit_base/svunit_base.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_base.sv
rename to tests/svunit_base/svunit_base.sv
diff --git a/axi4_lite_registers/svunit_base/svunit_defines.svh b/tests/svunit_base/svunit_defines.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_defines.svh
rename to tests/svunit_base/svunit_defines.svh
diff --git a/axi4_lite_registers/svunit_base/svunit_filter.svh b/tests/svunit_base/svunit_filter.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_filter.svh
rename to tests/svunit_base/svunit_filter.svh
diff --git a/axi4_lite_registers/svunit_base/svunit_globals.svh b/tests/svunit_base/svunit_globals.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_globals.svh
rename to tests/svunit_base/svunit_globals.svh
diff --git a/axi4_lite_registers/svunit_base/svunit_pkg.sv b/tests/svunit_base/svunit_pkg.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_pkg.sv
rename to tests/svunit_base/svunit_pkg.sv
diff --git a/axi4_lite_registers/svunit_base/svunit_testcase.sv b/tests/svunit_base/svunit_testcase.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_testcase.sv
rename to tests/svunit_base/svunit_testcase.sv
diff --git a/axi4_lite_registers/svunit_base/svunit_testrunner.sv b/tests/svunit_base/svunit_testrunner.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_testrunner.sv
rename to tests/svunit_base/svunit_testrunner.sv
diff --git a/axi4_lite_registers/svunit_base/svunit_testsuite.sv b/tests/svunit_base/svunit_testsuite.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_testsuite.sv
rename to tests/svunit_base/svunit_testsuite.sv
diff --git a/axi4_lite_registers/svunit_base/svunit_types.svh b/tests/svunit_base/svunit_types.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/svunit_types.svh
rename to tests/svunit_base/svunit_types.svh
diff --git a/axi4_lite_registers/svunit_base/util/clk_and_reset.svh b/tests/svunit_base/util/clk_and_reset.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/util/clk_and_reset.svh
rename to tests/svunit_base/util/clk_and_reset.svh
diff --git a/axi4_lite_registers/svunit_base/uvm-mock/svunit_idle_uvm_domain.sv b/tests/svunit_base/uvm-mock/svunit_idle_uvm_domain.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/uvm-mock/svunit_idle_uvm_domain.sv
rename to tests/svunit_base/uvm-mock/svunit_idle_uvm_domain.sv
diff --git a/axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_mock_pkg.sv b/tests/svunit_base/uvm-mock/svunit_uvm_mock_pkg.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_mock_pkg.sv
rename to tests/svunit_base/uvm-mock/svunit_uvm_mock_pkg.sv
diff --git a/axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_report_mock.sv b/tests/svunit_base/uvm-mock/svunit_uvm_report_mock.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_report_mock.sv
rename to tests/svunit_base/uvm-mock/svunit_uvm_report_mock.sv
diff --git a/axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_report_mock_types.svh b/tests/svunit_base/uvm-mock/svunit_uvm_report_mock_types.svh
similarity index 100%
rename from axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_report_mock_types.svh
rename to tests/svunit_base/uvm-mock/svunit_uvm_report_mock_types.svh
diff --git a/axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_test.sv b/tests/svunit_base/uvm-mock/svunit_uvm_test.sv
similarity index 100%
rename from axi4_lite_registers/svunit_base/uvm-mock/svunit_uvm_test.sv
rename to tests/svunit_base/uvm-mock/svunit_uvm_test.sv