diff --git a/firmware/Makefile b/firmware/Makefile
index befddb9..340359a 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -87,7 +87,7 @@
 VPATH += $(AT91LIB)/libchip_sam3s/source/ $(AT91LIB)/libchip_sam3s/cmsis
 VPATH += libboard/common/source libboard/$(BOARD)/source
 VPATH += libcommon/source
-VPATH += libosmocore/source src_board src_simtrace
+VPATH += libosmocore/source 
 VPATH += apps/$(APP)
 
 # Objects built from C source files
@@ -138,7 +138,6 @@
 INCLUDES += -Ilibboard/common/include -Ilibboard/$(BOARD)/include
 INCLUDES += -Ilibcommon/include
 INCLUDES += -Ilibosmocore/include
-INCLUDES += -Iinclude_board
 INCLUDES += -Isrc_simtrace -Iinclude
 
 CFLAGS += -Wall -Wchar-subscripts -Wcomment -Wimplicit-int #-Wformat=2
diff --git a/firmware/include_board/bitbanding.h b/firmware/atmel_softpack_libraries/libchip_sam3s/include/bitbanding.h
similarity index 100%
rename from firmware/include_board/bitbanding.h
rename to firmware/atmel_softpack_libraries/libchip_sam3s/include/bitbanding.h
diff --git a/firmware/include_board/cciddriver.h b/firmware/libcommon/include/cciddriver.h
similarity index 100%
rename from firmware/include_board/cciddriver.h
rename to firmware/libcommon/include/cciddriver.h
diff --git a/firmware/include_board/cciddriverdescriptors.h b/firmware/libcommon/include/cciddriverdescriptors.h
similarity index 100%
rename from firmware/include_board/cciddriverdescriptors.h
rename to firmware/libcommon/include/cciddriverdescriptors.h
diff --git a/firmware/include_board/iso7816_4.h b/firmware/libcommon/include/iso7816_4.h
similarity index 100%
rename from firmware/include_board/iso7816_4.h
rename to firmware/libcommon/include/iso7816_4.h
diff --git a/firmware/src_board/cciddriver.c b/firmware/libcommon/source/cciddriver.c
similarity index 100%
rename from firmware/src_board/cciddriver.c
rename to firmware/libcommon/source/cciddriver.c