diff --git a/include/connection.h b/include/neocomm/connection.h
similarity index 100%
rename from include/connection.h
rename to include/neocomm/connection.h
diff --git a/include/neocomm.h b/include/neocomm/neocomm.h
similarity index 100%
rename from include/neocomm.h
rename to include/neocomm/neocomm.h
diff --git a/include/nodes.h b/include/neocomm/nodes.h
similarity index 100%
rename from include/nodes.h
rename to include/neocomm/nodes.h
diff --git a/src/globals.h b/src/globals.h
index 15f32c7..6f8820f 100644
--- a/src/globals.h
+++ b/src/globals.h
@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include "nodes.h"
+#include "neocomm/nodes.h"
 
 // List of nodes
 extern struct NeoComm_node *node_list;
diff --git a/src/neocomm.c b/src/neocomm.c
index ba2b368..5a08fd1 100644
--- a/src/neocomm.c
+++ b/src/neocomm.c
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "neocomm.h"
+#include "neocomm/neocomm.h"
 
 int NeoComm_init(unsigned int max_nodes) {
 	if(!NeoComm_init_nodes(max_nodes))
diff --git a/src/nodes.c b/src/nodes.c
index 3795b91..dcf93a4 100644
--- a/src/nodes.c
+++ b/src/nodes.c
@@ -17,7 +17,7 @@
  * <http://www.gnu.org/licenses/>.
  */
 
-#include "nodes.h"
+#include "neocomm/nodes.h"
 
 #include "globals.h"