diff --git a/src/ieu/aes_instructions/aes32d.sv b/src/ieu/aes/aes32d.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes32d.sv
rename to src/ieu/aes/aes32d.sv
diff --git a/src/ieu/aes_instructions/aes32e.sv b/src/ieu/aes/aes32e.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes32e.sv
rename to src/ieu/aes/aes32e.sv
diff --git a/src/ieu/aes_instructions/aes64d.sv b/src/ieu/aes/aes64d.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes64d.sv
rename to src/ieu/aes/aes64d.sv
diff --git a/src/ieu/aes_instructions/aes64e.sv b/src/ieu/aes/aes64e.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes64e.sv
rename to src/ieu/aes/aes64e.sv
diff --git a/src/ieu/aes_instructions/aes64ks1i.sv b/src/ieu/aes/aes64ks1i.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes64ks1i.sv
rename to src/ieu/aes/aes64ks1i.sv
diff --git a/src/ieu/aes_instructions/aes64ks2.sv b/src/ieu/aes/aes64ks2.sv
similarity index 100%
rename from src/ieu/aes_instructions/aes64ks2.sv
rename to src/ieu/aes/aes64ks2.sv
diff --git a/src/ieu/aes_common/aesinvmixcolumns.sv b/src/ieu/aes/aesinvmixcolumns.sv
similarity index 100%
rename from src/ieu/aes_common/aesinvmixcolumns.sv
rename to src/ieu/aes/aesinvmixcolumns.sv
diff --git a/src/ieu/aes_common/aesinvsbox.sv b/src/ieu/aes/aesinvsbox.sv
similarity index 100%
rename from src/ieu/aes_common/aesinvsbox.sv
rename to src/ieu/aes/aesinvsbox.sv
diff --git a/src/ieu/aes_common/aesinvsboxword.sv b/src/ieu/aes/aesinvsboxword.sv
similarity index 100%
rename from src/ieu/aes_common/aesinvsboxword.sv
rename to src/ieu/aes/aesinvsboxword.sv
diff --git a/src/ieu/aes_common/aesinvshiftrow.sv b/src/ieu/aes/aesinvshiftrow.sv
similarity index 100%
rename from src/ieu/aes_common/aesinvshiftrow.sv
rename to src/ieu/aes/aesinvshiftrow.sv
diff --git a/src/ieu/aes_common/aesmixcolumns.sv b/src/ieu/aes/aesmixcolumns.sv
similarity index 100%
rename from src/ieu/aes_common/aesmixcolumns.sv
rename to src/ieu/aes/aesmixcolumns.sv
diff --git a/src/ieu/aes_common/aessbox.sv b/src/ieu/aes/aessbox.sv
similarity index 100%
rename from src/ieu/aes_common/aessbox.sv
rename to src/ieu/aes/aessbox.sv
diff --git a/src/ieu/aes_common/aessboxword.sv b/src/ieu/aes/aessboxword.sv
similarity index 100%
rename from src/ieu/aes_common/aessboxword.sv
rename to src/ieu/aes/aessboxword.sv
diff --git a/src/ieu/aes_common/aesshiftrow.sv b/src/ieu/aes/aesshiftrow.sv
similarity index 100%
rename from src/ieu/aes_common/aesshiftrow.sv
rename to src/ieu/aes/aesshiftrow.sv
diff --git a/src/ieu/aes_common/galoismultforward.sv b/src/ieu/aes/galoismultforward.sv
similarity index 100%
rename from src/ieu/aes_common/galoismultforward.sv
rename to src/ieu/aes/galoismultforward.sv
diff --git a/src/ieu/aes_common/galoismultinverse.sv b/src/ieu/aes/galoismultinverse.sv
similarity index 100%
rename from src/ieu/aes_common/galoismultinverse.sv
rename to src/ieu/aes/galoismultinverse.sv
diff --git a/src/ieu/aes_common/rconlut128.sv b/src/ieu/aes/rconlut128.sv
similarity index 100%
rename from src/ieu/aes_common/rconlut128.sv
rename to src/ieu/aes/rconlut128.sv
diff --git a/src/ieu/aes_common/rotate.sv b/src/ieu/aes/rotate.sv
similarity index 100%
rename from src/ieu/aes_common/rotate.sv
rename to src/ieu/aes/rotate.sv
diff --git a/src/ieu/sha_instructions/sha256sig0.sv b/src/ieu/sha/sha256sig0.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha256sig0.sv
rename to src/ieu/sha/sha256sig0.sv
diff --git a/src/ieu/sha_instructions/sha256sig1.sv b/src/ieu/sha/sha256sig1.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha256sig1.sv
rename to src/ieu/sha/sha256sig1.sv
diff --git a/src/ieu/sha_instructions/sha256sum0.sv b/src/ieu/sha/sha256sum0.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha256sum0.sv
rename to src/ieu/sha/sha256sum0.sv
diff --git a/src/ieu/sha_instructions/sha256sum1.sv b/src/ieu/sha/sha256sum1.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha256sum1.sv
rename to src/ieu/sha/sha256sum1.sv
diff --git a/src/ieu/sha_instructions/sha512sig0.sv b/src/ieu/sha/sha512sig0.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig0.sv
rename to src/ieu/sha/sha512sig0.sv
diff --git a/src/ieu/sha_instructions/sha512sig0h.sv b/src/ieu/sha/sha512sig0h.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig0h.sv
rename to src/ieu/sha/sha512sig0h.sv
diff --git a/src/ieu/sha_instructions/sha512sig0l.sv b/src/ieu/sha/sha512sig0l.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig0l.sv
rename to src/ieu/sha/sha512sig0l.sv
diff --git a/src/ieu/sha_instructions/sha512sig1.sv b/src/ieu/sha/sha512sig1.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig1.sv
rename to src/ieu/sha/sha512sig1.sv
diff --git a/src/ieu/sha_instructions/sha512sig1h.sv b/src/ieu/sha/sha512sig1h.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig1h.sv
rename to src/ieu/sha/sha512sig1h.sv
diff --git a/src/ieu/sha_instructions/sha512sig1l.sv b/src/ieu/sha/sha512sig1l.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sig1l.sv
rename to src/ieu/sha/sha512sig1l.sv
diff --git a/src/ieu/sha_instructions/sha512sum0.sv b/src/ieu/sha/sha512sum0.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sum0.sv
rename to src/ieu/sha/sha512sum0.sv
diff --git a/src/ieu/sha_instructions/sha512sum0r.sv b/src/ieu/sha/sha512sum0r.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sum0r.sv
rename to src/ieu/sha/sha512sum0r.sv
diff --git a/src/ieu/sha_instructions/sha512sum1.sv b/src/ieu/sha/sha512sum1.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sum1.sv
rename to src/ieu/sha/sha512sum1.sv
diff --git a/src/ieu/sha_instructions/sha512sum1r.sv b/src/ieu/sha/sha512sum1r.sv
similarity index 100%
rename from src/ieu/sha_instructions/sha512sum1r.sv
rename to src/ieu/sha/sha512sum1r.sv