diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1cc1589..e17aec8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,19 +105,20 @@ set(
     include/xeus-octave/xinterpreter.hpp
     include/xeus-octave/input.hpp
     include/xeus-octave/output.hpp
-    src/toolkits/notebook.hpp
-    src/toolkits/opengl.hpp
-    src/toolkits/plotly.hpp
-    src/toolkits/plotstream.hpp
-    src/toolkits/tex2html.hpp
-    src/xoctave/display.hpp
+    include/xeus-octave/utils.hpp
+    include/xeus-octave/tk_notebook.hpp
+    include/xeus-octave/opengl.hpp
+    include/xeus-octave/tk_plotly.hpp
+    include/xeus-octave/plotstream.hpp
+    include/xeus-octave/tex2html.hpp
+    include/xeus-octave/display.hpp
 )
 
 set(
     XEUS_OCTAVE_SRC
-    src/toolkits/plotly.cpp
-    src/toolkits/notebook.cpp
-    src/xoctave/display.cpp
+    src/tk_plotly.cpp
+    src/tk_notebook.cpp
+    src/display.cpp
     src/xinterpreter.cpp
     src/input.cpp
     src/output.cpp
diff --git a/src/xoctave/display.hpp b/include/xeus-octave/display.hpp
similarity index 100%
rename from src/xoctave/display.hpp
rename to include/xeus-octave/display.hpp
diff --git a/src/toolkits/opengl.hpp b/include/xeus-octave/opengl.hpp
similarity index 100%
rename from src/toolkits/opengl.hpp
rename to include/xeus-octave/opengl.hpp
diff --git a/src/toolkits/plotstream.hpp b/include/xeus-octave/plotstream.hpp
similarity index 100%
rename from src/toolkits/plotstream.hpp
rename to include/xeus-octave/plotstream.hpp
diff --git a/src/toolkits/tex2html.hpp b/include/xeus-octave/tex2html.hpp
similarity index 100%
rename from src/toolkits/tex2html.hpp
rename to include/xeus-octave/tex2html.hpp
diff --git a/src/toolkits/notebook.hpp b/include/xeus-octave/tk_notebook.hpp
similarity index 100%
rename from src/toolkits/notebook.hpp
rename to include/xeus-octave/tk_notebook.hpp
diff --git a/src/toolkits/plotly.hpp b/include/xeus-octave/tk_plotly.hpp
similarity index 100%
rename from src/toolkits/plotly.hpp
rename to include/xeus-octave/tk_plotly.hpp
diff --git a/src/xoctave/display.cpp b/src/display.cpp
similarity index 100%
rename from src/xoctave/display.cpp
rename to src/display.cpp
diff --git a/src/toolkits/notebook.cpp b/src/tk_notebook.cpp
similarity index 98%
rename from src/toolkits/notebook.cpp
rename to src/tk_notebook.cpp
index b133901..e83c84d 100644
--- a/src/toolkits/notebook.cpp
+++ b/src/tk_notebook.cpp
@@ -30,7 +30,7 @@
 #include <string>
 #include <vector>
 
-#include "opengl.hpp"
+#include "xeus-octave/opengl.hpp"
 
 #include <GLFW/glfw3.h>
 #include <nlohmann/json.hpp>
@@ -43,11 +43,10 @@
 #include <png.h>
 #include <xtl/xbase64.hpp>
 
+#include "xeus-octave/plotstream.hpp"
+#include "xeus-octave/tk_notebook.hpp"
 #include "xeus-octave/xinterpreter.hpp"
 
-#include "notebook.hpp"
-#include "plotstream.hpp"
-
 namespace nl = nlohmann;
 namespace oc = octave;
 using namespace std::chrono;
diff --git a/src/toolkits/plotly.cpp b/src/tk_plotly.cpp
similarity index 99%
rename from src/toolkits/plotly.cpp
rename to src/tk_plotly.cpp
index a8ef766..f333748 100644
--- a/src/toolkits/plotly.cpp
+++ b/src/tk_plotly.cpp
@@ -38,9 +38,9 @@
 #include <octave/utils.h>
 #include <octave/version.h>
 
-#include "plotly.hpp"
-#include "plotstream.hpp"
-#include "tex2html.hpp"
+#include "xeus-octave/plotstream.hpp"
+#include "xeus-octave/tex2html.hpp"
+#include "xeus-octave/tk_plotly.hpp"
 
 namespace oc = octave;
 namespace nl = nlohmann;
diff --git a/src/xinterpreter.cpp b/src/xinterpreter.cpp
index c2d2b53..0d71b28 100644
--- a/src/xinterpreter.cpp
+++ b/src/xinterpreter.cpp
@@ -54,15 +54,14 @@
 #include <xeus/xmessage.hpp>
 
 #include "xeus-octave/config.hpp"
+#include "xeus-octave/display.hpp"
 #include "xeus-octave/input.hpp"
 #include "xeus-octave/output.hpp"
+#include "xeus-octave/tk_notebook.hpp"
+#include "xeus-octave/tk_plotly.hpp"
 #include "xeus-octave/utils.hpp"
 #include "xeus-octave/xinterpreter.hpp"
 
-#include "toolkits/notebook.hpp"
-#include "toolkits/plotly.hpp"
-#include "xoctave/display.hpp"
-
 namespace nl = nlohmann;
 namespace oc = octave;