diff --git a/.github/workflows/cmake-build.yml b/.github/workflows/cmake-build.yml
index aed4773..9e28159 100644
--- a/.github/workflows/cmake-build.yml
+++ b/.github/workflows/cmake-build.yml
@@ -23,7 +23,7 @@ jobs:
           python-version: "3.10"
       - name: Generate C Structs
         run: |
-          cd files-c-array
+          cd utils/files-c-array
           python3 toCArray.py
       - name: Restore c-structs and verify their identity of restored with original files
         run: |
@@ -127,7 +127,7 @@ jobs:
       - name: Restore files and verify their identity of restored with original files
         run: |
           set -e
-          ./pysim/pySim-shell.py -p0 --script ./files-creation/all.pysim
+          ./pysim/pySim-shell.py -p0 --script ./utils/files-creation/all.pysim
           git add files
           git diff --cached --exit-code
 
diff --git a/files-c-array/ss_static_files_bin.c b/utils/files-c-array/ss_static_files_bin.c
similarity index 100%
rename from files-c-array/ss_static_files_bin.c
rename to utils/files-c-array/ss_static_files_bin.c
diff --git a/files-c-array/ss_static_files_bin.h b/utils/files-c-array/ss_static_files_bin.h
similarity index 100%
rename from files-c-array/ss_static_files_bin.h
rename to utils/files-c-array/ss_static_files_bin.h
diff --git a/files-c-array/ss_static_files_hex.c b/utils/files-c-array/ss_static_files_hex.c
similarity index 100%
rename from files-c-array/ss_static_files_hex.c
rename to utils/files-c-array/ss_static_files_hex.c
diff --git a/files-c-array/ss_static_files_hex.h b/utils/files-c-array/ss_static_files_hex.h
similarity index 100%
rename from files-c-array/ss_static_files_hex.h
rename to utils/files-c-array/ss_static_files_hex.h
diff --git a/files-c-array/toCArray.py b/utils/files-c-array/toCArray.py
similarity index 95%
rename from files-c-array/toCArray.py
rename to utils/files-c-array/toCArray.py
index ae68317..f3ad89f 100644
--- a/files-c-array/toCArray.py
+++ b/utils/files-c-array/toCArray.py
@@ -69,6 +69,6 @@ def get_dirs_and_files(path):
     files.sort()
 
     return files, directories
-to_c_array('../files', 'ss_static_files_bin.c', 'bin')
-to_c_array('../files', 'ss_static_files_hex.c', 'hex')
+to_c_array('../../files', 'ss_static_files_bin.c', 'bin')
+to_c_array('../../files', 'ss_static_files_hex.c', 'hex')
 
diff --git a/files-creation/all.pysim b/utils/files-creation/all.pysim
similarity index 100%
rename from files-creation/all.pysim
rename to utils/files-creation/all.pysim
diff --git a/files-creation/softsim_create_files.pysim b/utils/files-creation/softsim_create_files.pysim
similarity index 100%
rename from files-creation/softsim_create_files.pysim
rename to utils/files-creation/softsim_create_files.pysim
diff --git a/files-creation/softsim_create_files_minimal.pysim b/utils/files-creation/softsim_create_files_minimal.pysim
similarity index 100%
rename from files-creation/softsim_create_files_minimal.pysim
rename to utils/files-creation/softsim_create_files_minimal.pysim
diff --git a/files-creation/softsim_fill_files_efarr.pysim b/utils/files-creation/softsim_fill_files_efarr.pysim
similarity index 100%
rename from files-creation/softsim_fill_files_efarr.pysim
rename to utils/files-creation/softsim_fill_files_efarr.pysim
diff --git a/files-creation/softsim_fill_files_mf.pysim b/utils/files-creation/softsim_fill_files_mf.pysim
similarity index 100%
rename from files-creation/softsim_fill_files_mf.pysim
rename to utils/files-creation/softsim_fill_files_mf.pysim
diff --git a/files-creation/softsim_fill_files_usim.pysim b/utils/files-creation/softsim_fill_files_usim.pysim
similarity index 100%
rename from files-creation/softsim_fill_files_usim.pysim
rename to utils/files-creation/softsim_fill_files_usim.pysim