diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusm1+v13/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusm1+v13/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusm1+v13/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/api.h b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1+v12/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1+v12/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusm1+v13/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/api.h b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/api.h
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/encrypt.c b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny.h b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny.h
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_main.c b/romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusm1v12/armsrc/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusm1v12/armsrc_NEC/skinny_main.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/LWC_AEAD_KAT_128_128.txt b/romulus/Implementations/crypto_aead/romulusn1+v13/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/LWC_AEAD_KAT_128_128.txt
rename to romulus/Implementations/crypto_aead/romulusn1+v13/LWC_AEAD_KAT_128_128.txt
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/api.h b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/api.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/romulus.h b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/skinny128.s b/romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.s
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/armcortexm/skinny128.s
rename to romulus/Implementations/crypto_aead/romulusn1+v13/armcortexm/skinny128.s
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/api.h b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/api.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/romulus.h b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/romulus.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/romulus.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/romulus.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/skinny128.c b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/skinny128.c
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/skinny128.h b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/skinny128.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/skinny128.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/tk_schedule.c b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/tk_schedule.c
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1+v12/opt32/tk_schedule.h b/romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1+v12/opt32/tk_schedule.h
rename to romulus/Implementations/crypto_aead/romulusn1+v13/opt32/tk_schedule.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/api.h b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/api.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/api.h
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/api.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/crypto_aead.h b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/crypto_aead.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/crypto_aead.h
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/crypto_aead.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/encrypt.c b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/encrypt.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/encrypt.c
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/encrypt.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/genkat_aead.c b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/genkat_aead.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/genkat_aead.c
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/genkat_aead.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny.h b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny.h
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny.h
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny.h
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_key_schedule2.c b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule2.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_key_schedule2.c
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule2.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_key_schedule3.c b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule3.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_key_schedule3.c
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_key_schedule3.c
diff --git a/romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_main.c b/romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_main.c
similarity index 100%
rename from romulus/Implementations/crypto_aead/romulusn1v12/armsrc/skinny_main.c
rename to romulus/Implementations/crypto_aead/romulusn1v12/armsrc_NEC/skinny_main.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/LWC_AEAD_KAT_128_128.txt b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/LWC_AEAD_KAT_128_128.txt
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/LWC_AEAD_KAT_128_128.txt
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/LWC_AEAD_KAT_128_128.txt
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/api.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/api.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/api.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/api.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/crypto_aead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/crypto_aead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/crypto_aead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/crypto_aead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/encrypt.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/encrypt.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/encrypt.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/encrypt.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinny128.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinny128.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinny128.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinny128.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinny128.s b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinny128.s
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinny128.s
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinny128.s
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinnyaead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinnyaead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_1/skinnyaead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_1/skinnyaead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/api.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/api.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/api.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/api.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/crypto_aead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/crypto_aead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/crypto_aead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/crypto_aead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/encrypt.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/encrypt.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/encrypt.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/encrypt.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinny128.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinny128.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinny128.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinny128.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinny128.s b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinny128.s
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinny128.s
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinny128.s
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinnyaead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinnyaead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/armcortexm_2/skinnyaead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/armcortexm_2/skinnyaead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/api.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/api.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/api.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/api.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/crypto_aead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/crypto_aead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/crypto_aead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/crypto_aead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/encrypt.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/encrypt.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/encrypt.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/encrypt.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinny128.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinny128.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinny128.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinny128.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinny128.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinny128.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinny128.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinny128.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinnyaead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinnyaead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/skinnyaead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/skinnyaead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/tk_schedule.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/tk_schedule.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/tk_schedule.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/tk_schedule.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/tk_schedule.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/tk_schedule.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_1/tk_schedule.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_1/tk_schedule.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/api.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/api.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/api.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/api.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/crypto_aead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/crypto_aead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/crypto_aead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/crypto_aead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/encrypt.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/encrypt.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/encrypt.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/encrypt.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinny128.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinny128.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinny128.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinny128.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinny128.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinny128.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinny128.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinny128.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinnyaead.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinnyaead.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/skinnyaead.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/skinnyaead.h
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/tk_schedule.c b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/tk_schedule.c
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/tk_schedule.c
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/tk_schedule.c
diff --git a/skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/tk_schedule.h b/skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/tk_schedule.h
similarity index 100%
rename from skinny/Implementations/crypto_aead/skinnyaeadm1+v11/opt32_2/tk_schedule.h
rename to skinny/Implementations/crypto_aead/skinnyaeadtk3128128+v1/opt32_2/tk_schedule.h