diff --git a/Makefile b/Makefile
index 199830f..59a097b 100644
--- a/Makefile
+++ b/Makefile
@@ -70,7 +70,7 @@ define TargetSource_Template
 $(1): $(2)
 	@echo "[cc]: $(1) <-- $(2)"
 	@mkdir -p $(dir $(1))
-	@$(CC) $(CFLAGS_A) -I./$(strip $(3)) -c -o $(1) $(2)
+	@$(CC) $(CFLAGS_A) $(addprefix -I./,$(3)) $(addprefix -D, $(4)) -c -o $(1) $(2)
 endef
 
 # ----------------------------------------------------------------------------
@@ -92,8 +92,9 @@ $(foreach a, $(ALGORITHMS), \
   $(foreach b, $($(a)_OBJ), \
     $(eval $(call TargetSource_Template, \
       $(BIN_DIR)$(call lc, $(a))/$(b), \
-       $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
-      $($(a)_DIR) \
+      $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
+      $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR), \
+      $($(a)_DEFINES), \
     )) \
   ) \
 )
@@ -102,8 +103,9 @@ $(foreach a, $(ALGORITHMS), \
   $(foreach b, $($(a)_TEST_BIN), \
     $(eval $(call TargetSource_Template, \
       $(BIN_DIR)$(call lc, $(a))/$(TEST_DIR)$(b), \
-       $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
-      $($(a)_DIR) \
+      $(call find_source_file, $(b), $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR) ),\
+      $($(a)_DIR) $($(a)_INCDIR) $(GLOBAL_INCDIR), \
+      $($(a)_DEFINES) \
     )) \
   ) \
 )
@@ -226,6 +228,9 @@ $(foreach algo, $(ALGORITHMS), \
 	))\
 )
 
+.PHONY: all
+all: cores
+
 .PHONY: cores
 cores: $(foreach algo, $(ALGORITHMS), $(algo)_OBJ)
 
diff --git a/aes/aes_dec.c b/aes/aes_dec.c
index 778df62..8c476de 100644
--- a/aes/aes_dec.c
+++ b/aes/aes_dec.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 #include "aes.h"
 #include "aes_invsbox.h"
 #include "aes_dec.h"
diff --git a/aes/aes_enc.c b/aes/aes_enc.c
index 7b48bbf..dadf9f4 100644
--- a/aes/aes_enc.c
+++ b/aes/aes_enc.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "aes.h"
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 #include "aes_sbox.h"
 #include "aes_enc.h"
 #include <avr/pgmspace.h>
diff --git a/avr-makefile.inc b/avr-makefile.inc
index c2c4cd3..3bd0a3f 100644
--- a/avr-makefile.inc
+++ b/avr-makefile.inc
@@ -1,6 +1,8 @@
 
 MCU_TARGET     = atmega644
 OPTIMIZE       = -Os # -Os
+DEBUG          = -gdwarf-2
+WARNING        = -pedantic -Wall -Wstrict-prototypes
 PROGRAMMER     = avr911
 DEFS           = -D$(call uc, $(MCU_TARGET))
 FLASHCMD       = avrdude -p $(MCU_TARGET) -P /dev/ttyUSB0 -c $(PROGRAMMER) -U flash:w:# no space at the end
@@ -27,8 +29,8 @@ AUTOASM_OPT    = -S
 CC	       = avr-gcc
 CSTD           = c99
 
-override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
-override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@)) -I. -Itest_src -gdwarf-2 -pedantic -std=$(CSTD) -Wall -Wstrict-prototypes  $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS_A	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $(1))) $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
+override CFLAGS 	= -MMD -MF$(DEP_DIR)$(patsubst %.o,%.d,$(notdir $@))   $(DEBUG) $(WARNING) -std=$(CSTD) $(OPTIMIZE) -mmcu=$(MCU_TARGET) $(DEFS)
 
 override LDFLAGS       = -gdwarf-2 -Wl,-Map,
 override ASFLAGS	   = -mmcu=$(MCU_TARGET) -Wa,--gdwarf-2
diff --git a/base64/base64_dec.c b/base64/base64_dec.c
index 322cec0..5a0dcca 100644
--- a/base64/base64_dec.c
+++ b/base64/base64_dec.c
@@ -29,7 +29,7 @@
 #include <stdint.h>
 #include "base64_dec.h"
 
-#include "test_src/cli.h"
+#include "cli.h"
 
 /*
  #define USE_GCC_EXTENSION
diff --git a/bcal/bcal-cbc.c b/bcal/bcal-cbc.c
index 99e91ae..ee27c35 100644
--- a/bcal/bcal-cbc.c
+++ b/bcal/bcal-cbc.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "bcal-cbc.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 uint8_t bcal_cbc_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_cbc_ctx_t* ctx){
 	ctx->desc = (bcdesc_t*)desc;
diff --git a/bcal/bcal-cfb_byte.c b/bcal/bcal-cfb_byte.c
index f91f400..e0e5d22 100644
--- a/bcal/bcal-cfb_byte.c
+++ b/bcal/bcal-cfb_byte.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-cfb_byte.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 uint8_t bcal_cfb_B_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, uint16_t size_b, bcal_cfb_B_ctx_t* ctx){
diff --git a/bcal/bcal-cmac.c b/bcal/bcal-cmac.c
index 5821e26..abc9dfa 100644
--- a/bcal/bcal-cmac.c
+++ b/bcal/bcal-cmac.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-basic.h"
 #include "bcal-cmac.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 static uint8_t left_shift_be_block(void* block, uint8_t blocksize_B){
diff --git a/bcal/bcal-ctr.c b/bcal/bcal-ctr.c
index 60df831..694cedd 100644
--- a/bcal/bcal-ctr.c
+++ b/bcal/bcal-ctr.c
@@ -22,7 +22,7 @@
 #include <string.h>
 #include "bcal-basic.h"
 #include "bcal-ctr.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 static void increment_be(void* block, uint8_t size_B){
 	uint16_t c=1;
diff --git a/bcal/bcal-eax.c b/bcal/bcal-eax.c
index ca23e5c..9dceccd 100644
--- a/bcal/bcal-eax.c
+++ b/bcal/bcal-eax.c
@@ -24,7 +24,7 @@
 #include "bcal-cmac.h"
 #include "bcal-ctr.h"
 #include "bcal-eax.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 uint8_t bcal_eax_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_eax_ctx_t* ctx){
 	uint8_t r;
diff --git a/bcal/bcal-ofb.c b/bcal/bcal-ofb.c
index eb1fd4d..d7ae757 100644
--- a/bcal/bcal-ofb.c
+++ b/bcal/bcal-ofb.c
@@ -21,7 +21,7 @@
 #include <string.h>
 #include "bcal-ofb.h"
 #include "bcal-basic.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 uint8_t bcal_ofb_init(const bcdesc_t* desc, const void* key, uint16_t keysize_b, bcal_ofb_ctx_t* ctx){
diff --git a/bcal/bcal_noekeon.c b/bcal/bcal_noekeon.c
index 47e1c59..c58bdcb 100644
--- a/bcal/bcal_noekeon.c
+++ b/bcal/bcal_noekeon.c
@@ -3,7 +3,7 @@
 #include <avr/pgmspace.h>
 #include <stdlib.h>
 #include "blockcipher_descriptor.h"
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "keysize_descriptor.h"
 
 const char noekeon_direct_str[]   PROGMEM = "Noekeon-Direct";
diff --git a/bcal/bcal_noekeon.h b/bcal/bcal_noekeon.h
index 16a8179..e8ea544 100644
--- a/bcal/bcal_noekeon.h
+++ b/bcal/bcal_noekeon.h
@@ -2,7 +2,7 @@
 
 #include <avr/pgmspace.h>
 #include "blockcipher_descriptor.h"
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "keysize_descriptor.h"
 
 extern const bcdesc_t noekeon_direct_desc;
diff --git a/blake/blake_large.c b/blake/blake_large.c
index d2425e6..af967e2 100644
--- a/blake/blake_large.c
+++ b/blake/blake_large.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "blake_large.h"
 #include "blake_common.h"
 
diff --git a/blake/blake_small.c b/blake/blake_small.c
index 8425ac0..0f99668 100644
--- a/blake/blake_small.c
+++ b/blake/blake_small.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "blake_small.h"
 #include "blake_common.h"
 
diff --git a/bmw/bmw_small.c b/bmw/bmw_small.c
index 955c915..349ccf8 100644
--- a/bmw/bmw_small.c
+++ b/bmw/bmw_small.c
@@ -28,7 +28,7 @@
 #include <stdint.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "bmw_small.h"
 
 
diff --git a/cubehash/cubehash.c b/cubehash/cubehash.c
index 318d553..0cc62b0 100644
--- a/cubehash/cubehash.c
+++ b/cubehash/cubehash.c
@@ -26,7 +26,7 @@
  */
 
 
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "cubehash.h"
 #include "cubehash_rotates.h"
 #include "xchg.h"
diff --git a/dsa/dsa.h b/dsa/dsa.h
index 121341c..6a894f6 100644
--- a/dsa/dsa.h
+++ b/dsa/dsa.h
@@ -21,8 +21,8 @@
 #define DSA_H_
 
 #include <stdint.h>
-#include "hfal/hfal-basic.h"
-#include "bigint/bigint.h"
+#include "hfal-basic.h"
+#include "bigint.h"
 
 typedef struct{
 	bigint_t p;
diff --git a/dsa/dsa_key_blob.c b/dsa/dsa_key_blob.c
index b5e2478..fe31e53 100644
--- a/dsa/dsa_key_blob.c
+++ b/dsa/dsa_key_blob.c
@@ -22,7 +22,7 @@
 #include <avr/pgmspace.h>
 #include "cli.h"
 #include "dsa.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 
 
 #define DSA_KEY_BLOB_SIZE 1024
diff --git a/dsa/dsa_sign.c b/dsa/dsa_sign.c
index 64552e9..e9def2b 100644
--- a/dsa/dsa_sign.c
+++ b/dsa/dsa_sign.c
@@ -19,10 +19,10 @@
 
 #include <stdint.h>
 #include "cli.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "dsa.h"
 #include "hashfunction_descriptor.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 
 uint8_t dsa_sign_bigint(dsa_signature_t* s, const bigint_t* m,
 		                const dsa_ctx_t* ctx, const bigint_t* k){
diff --git a/dsa/dsa_verify.c b/dsa/dsa_verify.c
index 5001b9b..1faa68e 100644
--- a/dsa/dsa_verify.c
+++ b/dsa/dsa_verify.c
@@ -18,9 +18,9 @@
 */
 
 #include <stdint.h>
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "dsa.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 
 uint8_t dsa_verify_bigint(const dsa_signature_t* s, const bigint_t* m,
 		                  const dsa_ctx_t* ctx){
diff --git a/echo/echo.c b/echo/echo.c
index 407b1c5..98ee47c 100644
--- a/echo/echo.c
+++ b/echo/echo.c
@@ -19,8 +19,8 @@
 
 
 #include "echo.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <string.h>
 
diff --git a/entropium/entropium.c b/entropium/entropium.c
index b86cd1b..ed56607 100644
--- a/entropium/entropium.c
+++ b/entropium/entropium.c
@@ -48,7 +48,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "entropium.h"
 
 /**
diff --git a/groestl/groestl_large.c b/groestl/groestl_large.c
index 322e1c6..bcfd8e5 100644
--- a/groestl/groestl_large.c
+++ b/groestl/groestl_large.c
@@ -26,9 +26,9 @@
  */
 
 #include "groestl_large.h"
-#include "aes/aes_sbox.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "aes_sbox.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <avr/pgmspace.h>
 #include <string.h>
diff --git a/groestl/groestl_small.c b/groestl/groestl_small.c
index 7e59ca4..44ab7ee 100644
--- a/groestl/groestl_small.c
+++ b/groestl/groestl_small.c
@@ -26,9 +26,9 @@
  */
 
 #include "groestl_small.h"
-#include "aes/aes_sbox.h"
-#include "gf256mul/gf256mul.h"
-#include "memxor/memxor.h"
+#include "aes_sbox.h"
+#include "gf256mul.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <avr/pgmspace.h>
 #include <string.h>
diff --git a/hfal/hfal_sha1.c b/hfal/hfal_sha1.c
index 26128ee..04023e7 100644
--- a/hfal/hfal_sha1.c
+++ b/hfal/hfal_sha1.c
@@ -28,7 +28,7 @@
 #include <avr/pgmspace.h>
 #include <stdlib.h>
 #include "hashfunction_descriptor.h"
-#include "sha1/sha1.h"
+#include "sha1.h"
 
 static const char sha1_str[]   PROGMEM = "SHA-1";
 
diff --git a/hmac-md5/hmac-md5.c b/hmac-md5/hmac-md5.c
index 241ebcf..d72dca9 100644
--- a/hmac-md5/hmac-md5.c
+++ b/hmac-md5/hmac-md5.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "md5/md5.h"
+#include "md5.h"
 #include "hmac-md5.h"
 
 #define IPAD 0x36
diff --git a/hmac-md5/hmac-md5.h b/hmac-md5/hmac-md5.h
index 6bd8e12..5bbaeb9 100644
--- a/hmac-md5/hmac-md5.h
+++ b/hmac-md5/hmac-md5.h
@@ -19,7 +19,7 @@
 #ifndef HMACMD5_H_
 #define HMACMD5_H_
 
-#include "md5/md5.h"
+#include "md5.h"
 
 #define HMAC_MD5_BITS        MD5_HASH_BITS
 #define HMAC_MD5_BYTES       MD5_HASH_BYTES
diff --git a/hmac-sha1/hmac-sha1.c b/hmac-sha1/hmac-sha1.c
index 7830402..56d90ac 100644
--- a/hmac-sha1/hmac-sha1.c
+++ b/hmac-sha1/hmac-sha1.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "hmac-sha1.h"
 
 #define IPAD 0x36
diff --git a/hmac-sha1/hmac-sha1.h b/hmac-sha1/hmac-sha1.h
index 78fa7c0..d0be029 100644
--- a/hmac-sha1/hmac-sha1.h
+++ b/hmac-sha1/hmac-sha1.h
@@ -19,7 +19,7 @@
 #ifndef HMACSHA1_H_
 #define HMACSHA1_H_
 
-#include "sha1/sha1.h"
+#include "sha1.h"
 
 #define HMAC_SHA1_BITS        SHA1_HASH_BITS
 #define HMAC_SHA1_BYTES       SHA1_HASH_BYTES
diff --git a/hmac-sha256/hmac-sha256.c b/hmac-sha256/hmac-sha256.c
index c5e53fd..6a57189 100644
--- a/hmac-sha256/hmac-sha256.c
+++ b/hmac-sha256/hmac-sha256.c
@@ -31,7 +31,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "config.h"
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "hmac-sha256.h"
 
 #define IPAD 0x36
diff --git a/hmac-sha256/hmac-sha256.h b/hmac-sha256/hmac-sha256.h
index e2bd178..4df6af5 100644
--- a/hmac-sha256/hmac-sha256.h
+++ b/hmac-sha256/hmac-sha256.h
@@ -19,7 +19,7 @@
 #ifndef HMACSHA256_H_
 #define HMACSHA256_H_
 
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #define HMAC_SHA256_BITS        SHA256_HASH_BITS
 #define HMAC_SHA256_BYTES       SHA256_HASH_BYTES
diff --git a/host/gf256_table_gen.c b/host/gf256_table_gen.c
index 395343a..b359411 100644
--- a/host/gf256_table_gen.c
+++ b/host/gf256_table_gen.c
@@ -28,7 +28,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <getopt.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 int print_header =  1,
     print_braces =  1,
diff --git a/host/gf256mul.c b/host/gf256mul.c
index e2d7a88..b3dd460 100644
--- a/host/gf256mul.c
+++ b/host/gf256mul.c
@@ -25,7 +25,7 @@
  * 
  */
 #include <stdint.h>
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 uint8_t gf256mul(uint8_t a, uint8_t b, uint8_t reducer){
 	uint8_t i;
diff --git a/keccak/keccak.c b/keccak/keccak.c
index 3b43a5f..e7d5279 100644
--- a/keccak/keccak.c
+++ b/keccak/keccak.c
@@ -21,7 +21,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "rotate64.h"
 #include "keccak.h"
 
diff --git a/memxor/memxor_c.c b/memxor/memxor_c.c
index e438d5d..7485b3e 100644
--- a/memxor/memxor_c.c
+++ b/memxor/memxor_c.c
@@ -1,6 +1,6 @@
 #include <stdint.h>
 
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 void memxor(void* dest, const void* src, uint16_t n){
   while(n--){
diff --git a/mkfiles/rsa.mk b/mkfiles/rsa.mk
index 5158be9..aa13459 100644
--- a/mkfiles/rsa.mk
+++ b/mkfiles/rsa.mk
@@ -5,7 +5,7 @@ ALGO_NAME := RSA
 PK_CIPHERS += $(ALGO_NAME)
 
 $(ALGO_NAME)_DIR      := rsa/
-$(ALGO_NAME)_INCDIR   := bigint/ noekeon/ memxor/
+$(ALGO_NAME)_INCDIR   := bigint/ noekeon/ memxor/ hfal/
 $(ALGO_NAME)_OBJ      := bigint.o bigint_io.o bigint_add_u.o rsa.o rsa_key_blob.o
 $(ALGO_NAME)_TEST_BIN := main-rsa-test.o $(CLI_STD)  \
                          noekeon_asm.o noekeon_prng.o memxor.o 
diff --git a/mqq-sign/mqq160-sign.c b/mqq-sign/mqq160-sign.c
index e49f53a..2843f7b 100644
--- a/mqq-sign/mqq160-sign.c
+++ b/mqq-sign/mqq160-sign.c
@@ -18,7 +18,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 #include "cli.h"
diff --git a/mqq-sign/mqq160-sign_P-stub.c b/mqq-sign/mqq160-sign_P-stub.c
index f564e0d..d8c889f 100644
--- a/mqq-sign/mqq160-sign_P-stub.c
+++ b/mqq-sign/mqq160-sign_P-stub.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 /*
diff --git a/mqq-sign/mqq160-sign_P.c b/mqq-sign/mqq160-sign_P.c
index 914a338..82c90ea 100644
--- a/mqq-sign/mqq160-sign_P.c
+++ b/mqq-sign/mqq160-sign_P.c
@@ -31,7 +31,7 @@
 #include <string.h>
 #include <stdint.h>
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "mqq160-sign.h"
 
 static uint8_t mod20_table[32] PROGMEM = {
diff --git a/mugi/mugi.c b/mugi/mugi.c
index 87adc01..0be9f9a 100644
--- a/mugi/mugi.c
+++ b/mugi/mugi.c
@@ -29,12 +29,12 @@
 #include <stdlib.h>
 #include <string.h>
 #include <avr/pgmspace.h>
-#include "aes/aes_sbox.h"
+#include "aes_sbox.h"
 #include "mugi.h"
-#include "gf256mul/gf256mul.h"
+#include "gf256mul.h"
 
 /*
-#include "test_src/cli.h" / * only for debugging * /
+#include "cli.h" / * only for debugging * /
 
 void dump_mugi_ctx(mugi_ctx_t* ctx){
 	uint8_t i;
diff --git a/noekeon/noekeon.c b/noekeon/noekeon.c
index a800d4d..f48d1e6 100644
--- a/noekeon/noekeon.c
+++ b/noekeon/noekeon.c
@@ -31,7 +31,7 @@
 #ifdef __AVR__
 	#include <avr/pgmspace.h>
 #endif
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 // #include "cli.h"
 
 #define ROUND_NR 16
diff --git a/noekeon/noekeon_cbc_enc.h b/noekeon/noekeon_cbc_enc.h
index b47048f..e9ced11 100644
--- a/noekeon/noekeon_cbc_enc.h
+++ b/noekeon/noekeon_cbc_enc.h
@@ -2,7 +2,7 @@
 #define NOEKEON_CBC_ENC_H_
 
 #include <stdint.h>
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 
 void noekeon_cbc_enc(void* buffer, uint8_t block_cnt, const void* key);
 
diff --git a/noekeon/noekeon_ctr.h b/noekeon/noekeon_ctr.h
index 19cbe36..d7a601f 100644
--- a/noekeon/noekeon_ctr.h
+++ b/noekeon/noekeon_ctr.h
@@ -30,7 +30,7 @@
 #define NOEKEON_CTR_H_
 
 #include <stdint.h>
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 
 typedef struct{
 	uint8_t counter[16];
diff --git a/noekeon/noekeon_prng.c b/noekeon/noekeon_prng.c
index 5e984d2..4e73c7c 100644
--- a/noekeon/noekeon_prng.c
+++ b/noekeon/noekeon_prng.c
@@ -24,8 +24,8 @@
  * 
  */
 
-#include "noekeon/noekeon.h"
-#include "memxor/memxor.h"
+#include "noekeon.h"
+#include "memxor.h"
 #include <stdint.h>
 #include <string.h>
 
diff --git a/noekeon/omac_noekeon.h b/noekeon/omac_noekeon.h
index c9f1067..a4db052 100644
--- a/noekeon/omac_noekeon.h
+++ b/noekeon/omac_noekeon.h
@@ -27,7 +27,7 @@
 #ifndef NOEKEON_OMAC_H_
 #define NOEKEON_OMAC_H_
 
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include <stdint.h>
 
 typedef uint8_t omac_noekeon_ctx_t[16];
diff --git a/noekeon/omac_noekeon_C.c b/noekeon/omac_noekeon_C.c
index 923fc48..3046ede 100644
--- a/noekeon/omac_noekeon_C.c
+++ b/noekeon/omac_noekeon_C.c
@@ -1,6 +1,6 @@
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "omac_noekeon.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include <string.h>
 #include <stdint.h>
 
diff --git a/rsa/rsa.c b/rsa/rsa.c
index 0281c7e..9949a72 100644
--- a/rsa/rsa.c
+++ b/rsa/rsa.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include "cli.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 #include "rsa.h"
 
 uint8_t rsa_enc_bigint(bigint_t* c, const bigint_t* m,
diff --git a/rsa/rsa.h b/rsa/rsa.h
index 2d5c772..2582399 100644
--- a/rsa/rsa.h
+++ b/rsa/rsa.h
@@ -21,8 +21,8 @@
 #define RSA_H_
 
 #include <stdint.h>
-#include "hfal/hfal-basic.h"
-#include "bigint/bigint.h"
+#include "hfal-basic.h"
+#include "bigint.h"
 
 
 typedef bigint_t rsa_modulus_t;
diff --git a/rsa/rsa_key_blob.c b/rsa/rsa_key_blob.c
index 1a7a622..dfe51b2 100644
--- a/rsa/rsa_key_blob.c
+++ b/rsa/rsa_key_blob.c
@@ -22,7 +22,7 @@
 #include <avr/pgmspace.h>
 #include "cli.h"
 #include "rsa.h"
-#include "bigint/bigint.h"
+#include "bigint.h"
 
 #define RSA_KEYSIZE 1024
 
diff --git a/serpent/serpent.c b/serpent/serpent.c
index 41dca4b..40ccecd 100644
--- a/serpent/serpent.c
+++ b/serpent/serpent.c
@@ -26,7 +26,7 @@
 #include <stdint.h>
 #include <string.h> /* memset() */
 #include <avr/pgmspace.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "serpent.h"
 #include "serpent-sboxes.h"
 
diff --git a/shabea/shabea.c b/shabea/shabea.c
index e5ca5d8..b59e138 100644
--- a/shabea/shabea.c
+++ b/shabea/shabea.c
@@ -33,10 +33,10 @@
  */
 #include <stdlib.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #include "config.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 
 /*
diff --git a/shacal1/shacal1_enc.c b/shacal1/shacal1_enc.c
index 62e5cd4..634f18d 100644
--- a/shacal1/shacal1_enc.c
+++ b/shacal1/shacal1_enc.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "shacal1_enc.h"
 
 void shacal1_enc(void* buffer, void* key, uint16_t keysize_b){
diff --git a/shacal2/shacal2_enc.c b/shacal2/shacal2_enc.c
index c0cadcd..b5380e5 100644
--- a/shacal2/shacal2_enc.c
+++ b/shacal2/shacal2_enc.c
@@ -28,7 +28,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "shacal2_enc.h"
 
 
diff --git a/shacal2/shacal2_enc.h b/shacal2/shacal2_enc.h
index 3aeeafc..ffa277c 100644
--- a/shacal2/shacal2_enc.h
+++ b/shacal2/shacal2_enc.h
@@ -20,7 +20,7 @@
 #define SHACAL2_ENC_H_
 
 #include <stdint.h>
-#include "sha256/sha256.h"
+#include "sha256.h"
 
 #define SHACAL2_BLOCKSIZE  SHA256_HASH_BITS
 #define SHACAL2_BLOCKSIZE_B ((SHACAL2_BLOCKSIZE+7)/8)
diff --git a/skein/ubi1024.c b/skein/ubi1024.c
index 6e9cc4c..ae17cb3 100644
--- a/skein/ubi1024.c
+++ b/skein/ubi1024.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi1024_init(ubi1024_ctx_t* ctx, const void* g, uint8_t type){
diff --git a/skein/ubi256.c b/skein/ubi256.c
index 31523da..09eb1e9 100644
--- a/skein/ubi256.c
+++ b/skein/ubi256.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi256_init(ubi256_ctx_t* ctx, const void* g, uint8_t type){
diff --git a/skein/ubi512.c b/skein/ubi512.c
index a2bd33e..d6bab2d 100644
--- a/skein/ubi512.c
+++ b/skein/ubi512.c
@@ -27,7 +27,7 @@
 #include <stdint.h>
 #include <string.h>
 #include "threefish.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "ubi.h"
 
 void ubi512_init(ubi512_ctx_t* ctx, const void* g, uint8_t type){
diff --git a/test_src/cmacvs.c b/test_src/cmacvs.c
index 60a56c8..64bfd0b 100644
--- a/test_src/cmacvs.c
+++ b/test_src/cmacvs.c
@@ -30,8 +30,8 @@
 #include <string.h>
 #include <ctype.h>
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-basic.h"
-#include "bcal/bcal-cmac.h"
+#include "bcal-basic.h"
+#include "bcal-cmac.h"
 #include "cmacvs.h"
 #include "string-extras.h"
 #include "cli.h"
diff --git a/test_src/main-aes-test.c b/test_src/main-aes-test.c
index 88f87d5..8c41dd2 100644
--- a/test_src/main-aes-test.c
+++ b/test_src/main-aes-test.c
@@ -26,25 +26,25 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "dump.h"
 
-#include "bcal/bcal_aes128.h"
-#include "bcal/bcal_aes192.h"
-#include "bcal/bcal_aes256.h"
-#include "bcal/bcal-cbc.h"
-#include "bcal/bcal-cfb_byte.h"
-#include "bcal/bcal-cfb_bit.h"
-#include "bcal/bcal-ofb.h"
-#include "bcal/bcal-ctr.h"
-#include "bcal/bcal-cmac.h"
-#include "bcal/bcal-eax.h"
+#include "bcal_aes128.h"
+#include "bcal_aes192.h"
+#include "bcal_aes256.h"
+#include "bcal-cbc.h"
+#include "bcal-cfb_byte.h"
+#include "bcal-cfb_bit.h"
+#include "bcal-ofb.h"
+#include "bcal-ctr.h"
+#include "bcal-cmac.h"
+#include "bcal-eax.h"
 #include "cmacvs.h"
-#include "bcal/bcal-performance.h"
+#include "bcal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-aes128-test.c b/test_src/main-aes128-test.c
index 4bd2e97..1410d92 100644
--- a/test_src/main-aes128-test.c
+++ b/test_src/main-aes128-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes128.h"
+#include "bcal-performance.h"
+#include "bcal_aes128.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/test_src/main-aes192-test.c b/test_src/main-aes192-test.c
index 96fbf3e..ea92c11 100644
--- a/test_src/main-aes192-test.c
+++ b/test_src/main-aes192-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes192.h"
+#include "bcal-performance.h"
+#include "bcal_aes192.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/test_src/main-aes256-test.c b/test_src/main-aes256-test.c
index 68a82ac..039a6d2 100644
--- a/test_src/main-aes256-test.c
+++ b/test_src/main-aes256-test.c
@@ -26,13 +26,13 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "aes/aes.h"
+#include "aes.h"
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
 #include "blockcipher_descriptor.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_aes256.h"
+#include "bcal-performance.h"
+#include "bcal_aes256.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/test_src/main-base64-test.c b/test_src/main-base64-test.c
index 6187874..caf60fa 100644
--- a/test_src/main-base64-test.c
+++ b/test_src/main-base64-test.c
@@ -26,8 +26,8 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
 #include "base64_enc.h"
 #include "base64_dec.h"
 
diff --git a/test_src/main-bigint-test.c b/test_src/main-bigint-test.c
index 06d8706..8fd4136 100644
--- a/test_src/main-bigint-test.c
+++ b/test_src/main-bigint-test.c
@@ -26,8 +26,8 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
 #include "bigint.h"
 #include "bigint_io.h"
 
diff --git a/test_src/main-blake-test.c b/test_src/main-blake-test.c
index aec3149..6b18c38 100644
--- a/test_src/main-blake-test.c
+++ b/test_src/main-blake-test.c
@@ -28,11 +28,11 @@
 
 #include "blake_small.h"
 #include "blake_large.h"
-#include "hfal/hfal_blake_small.h"
-#include "hfal/hfal_blake_large.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_blake_small.h"
+#include "hfal_blake_large.h"
+#include "hfal-nessie.h"
+#include "hfal-test.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "cli.h"
 #include "nessie_hash_test.h"
diff --git a/test_src/main-bmw-test.c b/test_src/main-bmw-test.c
index f46f395..2da30a0 100644
--- a/test_src/main-bmw-test.c
+++ b/test_src/main-bmw-test.c
@@ -28,14 +28,14 @@
 #include "bmw_small.h"
 #include "bmw_large.h"
 #include "cli.h"
-#include "hfal/hfal_bmw_small.h"
-#include "hfal/hfal_bmw_large.h"
+#include "hfal_bmw_small.h"
+#include "hfal_bmw_large.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-camellia-test.c b/test_src/main-camellia-test.c
index ddcefac..fb9f881 100644
--- a/test_src/main-camellia-test.c
+++ b/test_src/main-camellia-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "performance_test.h"
 #include "cli.h"
-#include "bcal/bcal_camellia128.h"
-#include "bcal/bcal-performance.h"
+#include "bcal_camellia128.h"
+#include "bcal-performance.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/test_src/main-cast5-test.c b/test_src/main-cast5-test.c
index 392d8c0..3db72a7 100644
--- a/test_src/main-cast5-test.c
+++ b/test_src/main-cast5-test.c
@@ -29,8 +29,8 @@
 #include <cast5.h>
 #include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_cast5.h"
+#include "bcal-performance.h"
+#include "bcal_cast5.h"
 #include "cli.h"
 
 #include <stdint.h>
diff --git a/test_src/main-cast6-test.c b/test_src/main-cast6-test.c
index bc7cb73..c295b69 100644
--- a/test_src/main-cast6-test.c
+++ b/test_src/main-cast6-test.c
@@ -12,8 +12,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_cast6.h"
+#include "bcal-performance.h"
+#include "bcal_cast6.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-cubehash-test.c b/test_src/main-cubehash-test.c
index f69868c..2ae29e7 100644
--- a/test_src/main-cubehash-test.c
+++ b/test_src/main-cubehash-test.c
@@ -27,13 +27,13 @@
 
 #include "cubehash.h"
 #include "cli.h"
-#include "hfal/hfal_cubehash.h"
+#include "hfal_cubehash.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-des-test.c b/test_src/main-des-test.c
index 19ddadd..f6d237c 100644
--- a/test_src/main-des-test.c
+++ b/test_src/main-des-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_des.h"
+#include "bcal-performance.h"
+#include "bcal_des.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-dsa-test.c b/test_src/main-dsa-test.c
index d599b77..acbffa9 100644
--- a/test_src/main-dsa-test.c
+++ b/test_src/main-dsa-test.c
@@ -26,18 +26,18 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
-#include "bigint/bigint.h"
-#include "bigint/bigint_io.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
+#include "bigint.h"
+#include "bigint_io.h"
 #include "dsa.h"
 #include "dsa_key_blob.h"
 
 #include "cli.h"
 #include "performance_test.h"
-#include "hfal/hfal_sha1.h"
-#include "base64/base64_enc.h"
-#include "base64/base64_dec.h"
+#include "hfal_sha1.h"
+#include "base64_enc.h"
+#include "base64_dec.h"
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
diff --git a/test_src/main-echo-test.c b/test_src/main-echo-test.c
index 073cdd0..b4d81a9 100644
--- a/test_src/main-echo-test.c
+++ b/test_src/main-echo-test.c
@@ -27,13 +27,13 @@
 
 #include "echo.h"
 #include "cli.h"
-#include "hfal/hfal_echo.h"
+#include "hfal_echo.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-groestl-test.c b/test_src/main-groestl-test.c
index ff47dc4..5b46497 100644
--- a/test_src/main-groestl-test.c
+++ b/test_src/main-groestl-test.c
@@ -28,11 +28,11 @@
 
 #include "groestl_small.h"
 #include "groestl_large.h"
-#include "hfal/hfal_groestl_small.h"
-#include "hfal/hfal_groestl_large.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_groestl_small.h"
+#include "hfal_groestl_large.h"
+#include "hfal-nessie.h"
+#include "hfal-test.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "cli.h"
 #include "nessie_hash_test.h"
diff --git a/test_src/main-hmac-md5-test.c b/test_src/main-hmac-md5-test.c
index 0ae2d66..fcf6dce 100644
--- a/test_src/main-hmac-md5-test.c
+++ b/test_src/main-hmac-md5-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "md5/md5.h"
+#include "md5.h"
 #include "hmac-md5.h"
 /*
 #include "base64_enc.h"
diff --git a/test_src/main-hmac-sha1-test.c b/test_src/main-hmac-sha1-test.c
index 2dc9fcc..538d36a 100644
--- a/test_src/main-hmac-sha1-test.c
+++ b/test_src/main-hmac-sha1-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "sha1/sha1.h"
+#include "sha1.h"
 #include "hmac-sha1.h"
 
 #include "nessie_mac_test.h"
diff --git a/test_src/main-hmac-sha256-test.c b/test_src/main-hmac-sha256-test.c
index b98fb20..b6ca3fa 100644
--- a/test_src/main-hmac-sha256-test.c
+++ b/test_src/main-hmac-sha256-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "sha256/sha256.h"
+#include "sha256.h"
 #include "hmac-sha256.h"
 
 #include "cli.h"
diff --git a/test_src/main-keccak-test.c b/test_src/main-keccak-test.c
index ba66f31..80ed373 100644
--- a/test_src/main-keccak-test.c
+++ b/test_src/main-keccak-test.c
@@ -27,13 +27,13 @@
 
 #include "keccak.h"
 #include "cli.h"
-#include "hfal/hfal_keccak.h"
+#include "hfal_keccak.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-md5-test.c b/test_src/main-md5-test.c
index b046354..08c03cd 100644
--- a/test_src/main-md5-test.c
+++ b/test_src/main-md5-test.c
@@ -29,8 +29,8 @@
 #include "md5.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal_md5.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_md5.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-noekeon-test.c b/test_src/main-noekeon-test.c
index f19a91c..f7dbfb4 100644
--- a/test_src/main-noekeon-test.c
+++ b/test_src/main-noekeon-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_noekeon.h"
+#include "bcal-performance.h"
+#include "bcal_noekeon.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-omac-noekeon-test.c b/test_src/main-omac-noekeon-test.c
index 4e85268..117a2e1 100644
--- a/test_src/main-omac-noekeon-test.c
+++ b/test_src/main-omac-noekeon-test.c
@@ -26,7 +26,7 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
+#include "noekeon.h"
 #include "omac_noekeon.h"
 
 #include "cli.h"
diff --git a/test_src/main-present-test.c b/test_src/main-present-test.c
index 23d3506..96b0ff7 100644
--- a/test_src/main-present-test.c
+++ b/test_src/main-present-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_present.h"
+#include "bcal-performance.h"
+#include "bcal_present.h"
 
 #include <stdlib.h>
 #include <stdint.h>
diff --git a/test_src/main-rc5-test.c b/test_src/main-rc5-test.c
index 6c7da70..95a3e06 100644
--- a/test_src/main-rc5-test.c
+++ b/test_src/main-rc5-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc5.h"
+#include "bcal-performance.h"
+#include "bcal_rc5.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-rc6-test.c b/test_src/main-rc6-test.c
index b7e7786..67513ad 100644
--- a/test_src/main-rc6-test.c
+++ b/test_src/main-rc6-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_rc6.h"
+#include "bcal-performance.h"
+#include "bcal_rc6.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-rsa-test.c b/test_src/main-rsa-test.c
index fa71fe7..3de5bac 100644
--- a/test_src/main-rsa-test.c
+++ b/test_src/main-rsa-test.c
@@ -26,10 +26,10 @@
 #include "uart_i.h"
 #include "debug.h"
 
-#include "noekeon/noekeon.h"
-#include "noekeon/noekeon_prng.h"
-#include "bigint/bigint.h"
-#include "bigint/bigint_io.h"
+#include "noekeon.h"
+#include "noekeon_prng.h"
+#include "bigint.h"
+#include "bigint_io.h"
 #include "rsa.h"
 #include "rsa_key_blob.h"
 
diff --git a/test_src/main-seed-test.c b/test_src/main-seed-test.c
index 30433b8..9ff4b3f 100644
--- a/test_src/main-seed-test.c
+++ b/test_src/main-seed-test.c
@@ -35,8 +35,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_seed.h"
+#include "bcal-performance.h"
+#include "bcal_seed.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-serpent-test.c b/test_src/main-serpent-test.c
index db97c86..51575b9 100644
--- a/test_src/main-serpent-test.c
+++ b/test_src/main-serpent-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_serpent.h"
+#include "bcal-performance.h"
+#include "bcal_serpent.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-sha1-test.c b/test_src/main-sha1-test.c
index d1d819e..1b19d0a 100644
--- a/test_src/main-sha1-test.c
+++ b/test_src/main-sha1-test.c
@@ -28,15 +28,15 @@
 
 #include "sha1.h"
 #include "nessie_hash_test.h"
-#include "hfal/hfal_sha1.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_sha1.h"
+#include "hfal-performance.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
 #include "shavs.h"
-#include "hfal/hfal_sha1.h"
+#include "hfal_sha1.h"
 #include "dump.h"
 
 char* algo_name = "SHA-1";
diff --git a/test_src/main-sha256-test.c b/test_src/main-sha256-test.c
index 292a898..1907390 100644
--- a/test_src/main-sha256-test.c
+++ b/test_src/main-sha256-test.c
@@ -29,15 +29,15 @@
 #include "sha256.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
 
 #include <stdint.h>
 #include <string.h>
 #include <stdlib.h>
 #include "cli.h"
 #include "shavs.h"
-#include "hfal/hfal_sha256.h"
+#include "hfal_sha256.h"
 #include "dump.h"
 
 char* algo_name = "SHA-256";
diff --git a/test_src/main-shabal-test.c b/test_src/main-shabal-test.c
index 7995df3..bcdc57a 100644
--- a/test_src/main-shabal-test.c
+++ b/test_src/main-shabal-test.c
@@ -28,10 +28,10 @@
 
 #include "shabal.h"
 #include "cli.h"
-#include "hfal/hfal_shabal.h"
-#include "hfal/hfal-test.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
+#include "hfal_shabal.h"
+#include "hfal-test.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
diff --git a/test_src/main-skein-test.c b/test_src/main-skein-test.c
index dc46b13..2f0b04e 100644
--- a/test_src/main-skein-test.c
+++ b/test_src/main-skein-test.c
@@ -27,16 +27,16 @@
 #include "debug.h"
 
 #include "skein.h"
-#include "hfal/hfal_skein256.h"
-#include "hfal/hfal_skein512.h"
-#include "hfal/hfal_skein1024.h"
+#include "hfal_skein256.h"
+#include "hfal_skein512.h"
+#include "hfal_skein1024.h"
 #include "cli.h"
 #include "shavs.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-performance.h"
+#include "hfal-nessie.h"
+#include "hfal-basic.h"
 
 
 #include <stdint.h>
diff --git a/test_src/main-skipjack-test.c b/test_src/main-skipjack-test.c
index 2192816..3f1c75f 100644
--- a/test_src/main-skipjack-test.c
+++ b/test_src/main-skipjack-test.c
@@ -30,8 +30,8 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_skipjack.h"
+#include "bcal-performance.h"
+#include "bcal_skipjack.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-tdes-test.c b/test_src/main-tdes-test.c
index 4586199..7adc19e 100644
--- a/test_src/main-tdes-test.c
+++ b/test_src/main-tdes-test.c
@@ -30,9 +30,9 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_tdes.h"
-#include "bcal/bcal_tdes2.h"
+#include "bcal-performance.h"
+#include "bcal_tdes.h"
+#include "bcal_tdes2.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-threefish-test.c b/test_src/main-threefish-test.c
index f01aef7..31748e4 100644
--- a/test_src/main-threefish-test.c
+++ b/test_src/main-threefish-test.c
@@ -30,10 +30,10 @@
 #include "nessie_bc_test.h"
 #include "cli.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_threefish256.h"
-#include "bcal/bcal_threefish512.h"
-#include "bcal/bcal_threefish1024.h"
+#include "bcal-performance.h"
+#include "bcal_threefish256.h"
+#include "bcal_threefish512.h"
+#include "bcal_threefish1024.h"
 
 #include <stdint.h>
 #include <string.h>
diff --git a/test_src/main-twister-test.c b/test_src/main-twister-test.c
index b9a47cb..b4efd94 100644
--- a/test_src/main-twister-test.c
+++ b/test_src/main-twister-test.c
@@ -30,13 +30,13 @@
 #include "twister-large.h"
 #include "nessie_hash_test.h"
 #include "performance_test.h"
-#include "hfal/hfal_twister224.h"
-#include "hfal/hfal_twister256.h"
-#include "hfal/hfal_twister384.h"
-#include "hfal/hfal_twister512.h"
-#include "hfal/hfal-nessie.h"
-#include "hfal/hfal-performance.h"
-#include "hfal/hfal-test.h"
+#include "hfal_twister224.h"
+#include "hfal_twister256.h"
+#include "hfal_twister384.h"
+#include "hfal_twister512.h"
+#include "hfal-nessie.h"
+#include "hfal-performance.h"
+#include "hfal-test.h"
 #include "shavs.h"
 
 
diff --git a/test_src/main-xtea-test.c b/test_src/main-xtea-test.c
index 6fae984..c40046f 100644
--- a/test_src/main-xtea-test.c
+++ b/test_src/main-xtea-test.c
@@ -29,8 +29,8 @@
 #include "xtea.h"
 #include "nessie_bc_test.h"
 #include "performance_test.h"
-#include "bcal/bcal-performance.h"
-#include "bcal/bcal_xtea.h"
+#include "bcal-performance.h"
+#include "bcal_xtea.h"
 #include "cli.h"
 
 #include <stdint.h>
diff --git a/test_src/shavs.c b/test_src/shavs.c
index 3b0b389..39b862b 100644
--- a/test_src/shavs.c
+++ b/test_src/shavs.c
@@ -30,7 +30,7 @@
 #include <string.h>
 #include <ctype.h>
 #include "hashfunction_descriptor.h"
-#include "hfal/hfal-basic.h"
+#include "hfal-basic.h"
 #include "shavs.h"
 #include "string-extras.h"
 #include "cli.h"
diff --git a/twister/twister-large.c b/twister/twister-large.c
index 3455b5e..1775488 100644
--- a/twister/twister-large.c
+++ b/twister/twister-large.c
@@ -19,7 +19,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister.h"
 #include "twister-large.h"
 
diff --git a/twister/twister-small-stub.c b/twister/twister-small-stub.c
index 72cbe9c..9eb4112 100644
--- a/twister/twister-small-stub.c
+++ b/twister/twister-small-stub.c
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister-small.h"
 
 /*********************************************************************/
diff --git a/twister/twister-small.c b/twister/twister-small.c
index 4a05f19..5fb0536 100644
--- a/twister/twister-small.c
+++ b/twister/twister-small.c
@@ -2,7 +2,7 @@
 
 #include <stdint.h>
 #include <string.h>
-#include "memxor/memxor.h"
+#include "memxor.h"
 #include "twister-small.h"
 
 /*********************************************************************/
diff --git a/twister/twister.c b/twister/twister.c
index 40f3836..0135811 100644
--- a/twister/twister.c
+++ b/twister/twister.c
@@ -23,7 +23,7 @@
 #include <avr/pgmspace.h>
 #include "twister.h"
 #include "twister_tables.h"
-#include "memxor/memxor.h"
+#include "memxor.h"
 
 //#ifndef TWISTER_MUL_TABLE
 # include "gf256mul/gf256mul.h"