diff --git a/src/bitutils.h b/src/include/bitutils.h
similarity index 100%
rename from src/bitutils.h
rename to src/include/bitutils.h
diff --git a/src/defines.h b/src/include/defines.h
similarity index 100%
rename from src/defines.h
rename to src/include/defines.h
diff --git a/src/devices.h b/src/include/drivers.h
similarity index 100%
rename from src/devices.h
rename to src/include/drivers.h
diff --git a/src/messages.h b/src/include/messages.h
similarity index 100%
rename from src/messages.h
rename to src/include/messages.h
diff --git a/src/libnfc.h b/src/include/nfc.h
similarity index 100%
rename from src/libnfc.h
rename to src/include/nfc.h
diff --git a/src/types.h b/src/include/types.h
similarity index 100%
rename from src/types.h
rename to src/include/types.h
diff --git a/src/bitutils.c b/src/lib/bitutils.c
similarity index 100%
rename from src/bitutils.c
rename to src/lib/bitutils.c
diff --git a/src/rs232.c b/src/lib/bus/rs232.c
similarity index 100%
rename from src/rs232.c
rename to src/lib/bus/rs232.c
diff --git a/src/rs232.h b/src/lib/bus/rs232.h
similarity index 100%
rename from src/rs232.h
rename to src/lib/bus/rs232.h
diff --git a/src/dev_acr122.c b/src/lib/drivers/acr122.c
similarity index 100%
rename from src/dev_acr122.c
rename to src/lib/drivers/acr122.c
diff --git a/src/dev_acr122.h b/src/lib/drivers/acr122.h
similarity index 100%
rename from src/dev_acr122.h
rename to src/lib/drivers/acr122.h
diff --git a/src/dev_arygon.c b/src/lib/drivers/arygon.c
similarity index 100%
rename from src/dev_arygon.c
rename to src/lib/drivers/arygon.c
diff --git a/src/dev_arygon.h b/src/lib/drivers/arygon.h
similarity index 100%
rename from src/dev_arygon.h
rename to src/lib/drivers/arygon.h
diff --git a/src/dev_pn531.c b/src/lib/drivers/pn531.c
similarity index 100%
rename from src/dev_pn531.c
rename to src/lib/drivers/pn531.c
diff --git a/src/dev_pn531.h b/src/lib/drivers/pn531.h
similarity index 100%
rename from src/dev_pn531.h
rename to src/lib/drivers/pn531.h
diff --git a/src/dev_pn532_uart.c b/src/lib/drivers/pn532_uart.c
similarity index 100%
rename from src/dev_pn532_uart.c
rename to src/lib/drivers/pn532_uart.c
diff --git a/src/dev_pn532_uart.h b/src/lib/drivers/pn532_uart.h
similarity index 100%
rename from src/dev_pn532_uart.h
rename to src/lib/drivers/pn532_uart.h
diff --git a/src/dev_pn533.c b/src/lib/drivers/pn533.c
similarity index 100%
rename from src/dev_pn533.c
rename to src/lib/drivers/pn533.c
diff --git a/src/dev_pn533.h b/src/lib/drivers/pn533.h
similarity index 100%
rename from src/dev_pn533.h
rename to src/lib/drivers/pn533.h
diff --git a/src/libnfc.c b/src/lib/nfc.c
similarity index 100%
rename from src/libnfc.c
rename to src/lib/nfc.c