diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusm1+/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusm1+/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusm1+/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusm1+/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/api.h b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/api.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny.h b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_main.c b/romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/armsrc_NEC/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusm1+/armsrc_NEC/skinny_main.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/api.h b/romulus/Implementations/crypto_aead/romulusm1+/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1+/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1+/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusm1+/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusm1+/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1+/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusm1+/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusm1+/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusm1+/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusm1/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusm1/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusm1/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusm1/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/api.h b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/api.h
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny.h b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_main.c b/romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusm1/armsrc_NEC/skinny_main.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/api.h b/romulus/Implementations/crypto_aead/romulusm1/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusm1/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusm1/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusm1/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusm1/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusm1/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusm1/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusm1/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusm1/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusm1/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusm1/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm1/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusm1/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusm1/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusm1/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusm1/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusm1/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusm1/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusm1/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1/rhys/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/LWC_AEAD_KAT_128_96.txt b/romulus/Implementations/crypto_aead/romulusm2/LWC_AEAD_KAT_128_96.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/LWC_AEAD_KAT_128_96.txt
rename to romulus/Implementations/crypto_aead/romulusm2/LWC_AEAD_KAT_128_96.txt
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusm2/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusm2/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusm2/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm2/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusm2/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusm2/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusm2/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm2/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusm2/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusm2/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusm2/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusm2/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusm2/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusm2/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusm2/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusm2v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusm2/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm2v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm2/rhys/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/LWC_AEAD_KAT_128_96.txt b/romulus/Implementations/crypto_aead/romulusm3/LWC_AEAD_KAT_128_96.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/LWC_AEAD_KAT_128_96.txt
rename to romulus/Implementations/crypto_aead/romulusm3/LWC_AEAD_KAT_128_96.txt
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusm3/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusm3/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusm3/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm3/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusm3/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusm3/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusm3/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm3/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusm3/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusm3/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusm3/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusm3/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusm3/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusm3/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusm3/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusm3v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusm3/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm3v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm3/rhys/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusn1+/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusn1+/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusn1+/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusn1+/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/api.h b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/api.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny.h b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_main.c b/romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/armsrc_NEC/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusn1+/armsrc_NEC/skinny_main.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/api.h b/romulus/Implementations/crypto_aead/romulusn1+/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1+/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1+/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusn1+/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusn1+/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1+/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusn1+/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusn1+/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusn1+/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusn1/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusn1/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusn1/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusn1/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/api.h b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/api.h
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny.h b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_main.c b/romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusn1/armsrc_NEC/skinny_main.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/api.h b/romulus/Implementations/crypto_aead/romulusn1/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusn1/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusn1/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusn1/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusn1/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusn1/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusn1/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusn1/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusn1/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusn1/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusn1/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn1/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusn1/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusn1/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusn1/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusn1/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusn1/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusn1/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusn1/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1/rhys/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/LWC_AEAD_KAT_128_96.txt b/romulus/Implementations/crypto_aead/romulusn2/LWC_AEAD_KAT_128_96.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/LWC_AEAD_KAT_128_96.txt
rename to romulus/Implementations/crypto_aead/romulusn2/LWC_AEAD_KAT_128_96.txt
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusn2/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusn2/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusn2/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn2/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusn2/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusn2/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusn2/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn2/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusn2/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusn2/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusn2/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusn2/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusn2/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusn2/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusn2/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusn2v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusn2/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn2v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn2/rhys/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/LWC_AEAD_KAT_128_96.txt b/romulus/Implementations/crypto_aead/romulusn3/LWC_AEAD_KAT_128_96.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/LWC_AEAD_KAT_128_96.txt
rename to romulus/Implementations/crypto_aead/romulusn3/LWC_AEAD_KAT_128_96.txt
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/api.h b/romulus/Implementations/crypto_aead/romulusn3/ref/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/api.h
rename to romulus/Implementations/crypto_aead/romulusn3/ref/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/encrypt.c b/romulus/Implementations/crypto_aead/romulusn3/ref/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn3/ref/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusn3/ref/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusn3/ref/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/skinny.h b/romulus/Implementations/crypto_aead/romulusn3/ref/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn3/ref/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/skinny_reference.c b/romulus/Implementations/crypto_aead/romulusn3/ref/skinny_reference.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/skinny_reference.c
rename to romulus/Implementations/crypto_aead/romulusn3/ref/skinny_reference.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/ref/variant.h b/romulus/Implementations/crypto_aead/romulusn3/ref/variant.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/ref/variant.h
rename to romulus/Implementations/crypto_aead/romulusn3/ref/variant.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/aead-common.c b/romulus/Implementations/crypto_aead/romulusn3/rhys/aead-common.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/aead-common.c
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/aead-common.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/aead-common.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/aead-common.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/aead-common.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/aead-common.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/api.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/api.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/encrypt.c b/romulus/Implementations/crypto_aead/romulusn3/rhys/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinny128.c b/romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinny128.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinnyutil.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinnyutil.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-skinnyutil.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/internal-skinnyutil.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-util.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/internal-util.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/internal-util.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/internal-util.h
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/romulus.c b/romulus/Implementations/crypto_aead/romulusn3/rhys/romulus.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/romulus.c
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/romulus.c
diff --git a/romulus/Implementations/crypto_aead/romulusn3v12/rhys/romulus.h b/romulus/Implementations/crypto_aead/romulusn3/rhys/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn3v12/rhys/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn3/rhys/romulus.h