diff --git a/Makefile b/Makefile
index 0201336bc..e2c5e4163 100644
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ CFLAGS   += $(OPTFLAGS) \
 
 # disable sequence point warning because of AES code
 CFLAGS += -Wno-sequence-point
-CFLAGS += -Ied25519-donna -I.
+CFLAGS += -I. -Iaes -Ied25519-donna
 CFLAGS += -DUSE_ETHEREUM=1
 CFLAGS += -DUSE_GRAPHENE=1
 
@@ -40,7 +40,7 @@ SRCS  += script.c
 SRCS  += ripemd160.c
 SRCS  += sha2.c
 SRCS  += sha3.c
-SRCS  += aescrypt.c aeskey.c aestab.c aes_modes.c
+SRCS  += aes/aescrypt.c aes/aeskey.c aes/aestab.c aes/aes_modes.c
 SRCS  += ed25519-donna/ed25519.c
 SRCS  += blake2b.c blake2s.c
 
@@ -78,5 +78,5 @@ tools/bip39bruteforce: tools/bip39bruteforce.o $(OBJS)
 	$(CC) tools/bip39bruteforce.o $(OBJS) -o tools/bip39bruteforce
 
 clean:
-	rm -f *.o ed25519-donna/*.o tests test_speed test-openssl libtrezor-crypto.so
+	rm -f *.o aes/*.o ed25519-donna/*.o tests test_speed test-openssl libtrezor-crypto.so
 	rm -f tools/*.o tools/xpubaddrgen tools/mktable tools/bip39bruteforce
diff --git a/aes.h b/aes/aes.h
similarity index 100%
rename from aes.h
rename to aes/aes.h
diff --git a/aes_modes.c b/aes/aes_modes.c
similarity index 100%
rename from aes_modes.c
rename to aes/aes_modes.c
diff --git a/aescrypt.c b/aes/aescrypt.c
similarity index 100%
rename from aescrypt.c
rename to aes/aescrypt.c
diff --git a/aeskey.c b/aes/aeskey.c
similarity index 100%
rename from aeskey.c
rename to aes/aeskey.c
diff --git a/aesopt.h b/aes/aesopt.h
similarity index 100%
rename from aesopt.h
rename to aes/aesopt.h
diff --git a/aestab.c b/aes/aestab.c
similarity index 100%
rename from aestab.c
rename to aes/aestab.c
diff --git a/aestab.h b/aes/aestab.h
similarity index 100%
rename from aestab.h
rename to aes/aestab.h