diff --git a/get_submissions.sh b/get_submissions.sh
index d1619d6..707c71e 100755
--- a/get_submissions.sh
+++ b/get_submissions.sh
@@ -4,4 +4,5 @@ mkdir all-lwc-submission-files || exit 1
 cd all-lwc-submission-files
 wget https://csrc.nist.gov/CSRC/media/Projects/Lightweight-Cryptography/documents/round-1/submissions/all-lwc-submission-files.zip
 unzip all-lwc-submission-files.zip
+cp -r  ../mbed_aes_gcm/ .
 cd ..
diff --git a/mbed_aes_gcm/LWC_AEAD_KAT_128_96.txt b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/LWC_AEAD_KAT_128_96.txt
similarity index 100%
rename from mbed_aes_gcm/LWC_AEAD_KAT_128_96.txt
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/LWC_AEAD_KAT_128_96.txt
diff --git a/mbed_aes_gcm/Makefile b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/Makefile
similarity index 100%
rename from mbed_aes_gcm/Makefile
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/Makefile
diff --git a/mbed_aes_gcm/aes.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/aes.c
similarity index 100%
rename from mbed_aes_gcm/aes.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/aes.c
diff --git a/mbed_aes_gcm/aes.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/aes.h
similarity index 100%
rename from mbed_aes_gcm/aes.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/aes.h
diff --git a/mbed_aes_gcm/api.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/api.h
similarity index 100%
rename from mbed_aes_gcm/api.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/api.h
diff --git a/mbed_aes_gcm/cipher.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher.c
similarity index 100%
rename from mbed_aes_gcm/cipher.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher.c
diff --git a/mbed_aes_gcm/cipher.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher.h
similarity index 100%
rename from mbed_aes_gcm/cipher.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher.h
diff --git a/mbed_aes_gcm/cipher_internal.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher_internal.h
similarity index 100%
rename from mbed_aes_gcm/cipher_internal.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher_internal.h
diff --git a/mbed_aes_gcm/cipher_wrap.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher_wrap.c
similarity index 100%
rename from mbed_aes_gcm/cipher_wrap.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/cipher_wrap.c
diff --git a/mbed_aes_gcm/config.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/config.h
similarity index 100%
rename from mbed_aes_gcm/config.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/config.h
diff --git a/mbed_aes_gcm/crypto_aead.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/crypto_aead.h
similarity index 100%
rename from mbed_aes_gcm/crypto_aead.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/crypto_aead.h
diff --git a/mbed_aes_gcm/gcm.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/gcm.c
similarity index 100%
rename from mbed_aes_gcm/gcm.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/gcm.c
diff --git a/mbed_aes_gcm/gcm.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/gcm.h
similarity index 100%
rename from mbed_aes_gcm/gcm.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/gcm.h
diff --git a/mbed_aes_gcm/genkat_aead.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/genkat_aead.c
similarity index 100%
rename from mbed_aes_gcm/genkat_aead.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/genkat_aead.c
diff --git a/mbed_aes_gcm/platform_util.c b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/platform_util.c
similarity index 100%
rename from mbed_aes_gcm/platform_util.c
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/platform_util.c
diff --git a/mbed_aes_gcm/platform_util.h b/mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/platform_util.h
similarity index 100%
rename from mbed_aes_gcm/platform_util.h
rename to mbed_aes_gcm/Implementations/crypto_aead/aes128k96n/ref/platform_util.h