diff --git a/src/bloom.h b/include/bloom.h
similarity index 100%
rename from src/bloom.h
rename to include/bloom.h
diff --git a/src/contacts.h b/include/contacts.h
similarity index 100%
rename from src/contacts.h
rename to include/contacts.h
diff --git a/src/covid.h b/include/covid.h
similarity index 100%
rename from src/covid.h
rename to include/covid.h
diff --git a/src/covid_types.h b/include/covid_types.h
similarity index 100%
rename from src/covid_types.h
rename to include/covid_types.h
diff --git a/src/display.h b/include/display.h
similarity index 100%
rename from src/display.h
rename to include/display.h
diff --git a/src/ens/ens_error.h b/include/ens/ens_error.h
similarity index 100%
rename from src/ens/ens_error.h
rename to include/ens/ens_error.h
diff --git a/src/ens/ens_fs.h b/include/ens/ens_fs.h
similarity index 100%
rename from src/ens/ens_fs.h
rename to include/ens/ens_fs.h
diff --git a/src/ens/records.h b/include/ens/records.h
similarity index 100%
rename from src/ens/records.h
rename to include/ens/records.h
diff --git a/src/ens/sequencenumber.h b/include/ens/sequencenumber.h
similarity index 100%
rename from src/ens/sequencenumber.h
rename to include/ens/sequencenumber.h
diff --git a/src/ens/storage.h b/include/ens/storage.h
similarity index 98%
rename from src/ens/storage.h
rename to include/ens/storage.h
index 4b059b8..f6a2c3d 100644
--- a/src/ens/storage.h
+++ b/include/ens/storage.h
@@ -3,7 +3,7 @@
 
 #include <zephyr/types.h>
 
-#include "../covid_types.h"
+#include "covid_types.h"
 #include "sequencenumber.h"
 
 typedef uint64_t storage_id_t;
diff --git a/src/export.pb-c.h b/include/export.pb-c.h
similarity index 100%
rename from src/export.pb-c.h
rename to include/export.pb-c.h
diff --git a/src/extract_keys.h b/include/extract_keys.h
similarity index 100%
rename from src/extract_keys.h
rename to include/extract_keys.h
diff --git a/src/gatt_service.h b/include/gatt_service.h
similarity index 100%
rename from src/gatt_service.h
rename to include/gatt_service.h
diff --git a/src/io.h b/include/io.h
similarity index 100%
rename from src/io.h
rename to include/io.h
diff --git a/src/ens/ens_fs.c b/src/ens/ens_fs.c
index 33082ea..924e5ae 100644
--- a/src/ens/ens_fs.c
+++ b/src/ens/ens_fs.c
@@ -6,8 +6,8 @@
 #include <string.h>
 #include <sys/crc.h>
 
-#include "ens_error.h"
-#include "ens_fs.h"
+#include "ens/ens_error.h"
+#include "ens/ens_fs.h"
 
 #define SEED 42
 
diff --git a/src/ens/records.c b/src/ens/records.c
index ad10efa..6eeadff 100644
--- a/src/ens/records.c
+++ b/src/ens/records.c
@@ -1,11 +1,11 @@
 #include <string.h>
 
 #include <sys/types.h>
-#include "../covid_types.h"
-#include "ens_error.h"
-#include "records.h"
-#include "sequencenumber.h"
-#include "storage.h"
+#include "covid_types.h"
+#include "ens/ens_error.h"
+#include "ens/records.h"
+#include "ens/sequencenumber.h"
+#include "ens/storage.h"
 
 int ens_records_iterator_init_range(record_iterator_t* iterator,
                                     record_sequence_number_t* opt_start,
diff --git a/src/ens/sequencenumber.c b/src/ens/sequencenumber.c
index 8e903a0..79ea3d8 100644
--- a/src/ens/sequencenumber.c
+++ b/src/ens/sequencenumber.c
@@ -1,4 +1,4 @@
-#include "sequencenumber.h"
+#include "ens/sequencenumber.h"
 
 #define SN_MASK 0xffffff
 
diff --git a/src/ens/storage.c b/src/ens/storage.c
index 651b1b6..d3df970 100644
--- a/src/ens/storage.c
+++ b/src/ens/storage.c
@@ -7,10 +7,10 @@
 #include <string.h>
 #include <zephyr.h>
 
-#include "ens_error.h"
-#include "ens_fs.h"
-#include "sequencenumber.h"
-#include "storage.h"
+#include "ens/ens_error.h"
+#include "ens/ens_fs.h"
+#include "ens/sequencenumber.h"
+#include "ens/storage.h"
 
 #define STORED_CONTACTS_INFO_ID 0