diff --git a/main.cpp b/main.cpp
index 590f1ed..25c6512 100644
--- a/main.cpp
+++ b/main.cpp
@@ -1,6 +1,8 @@
-#include "view.hpp"
-#include "ui/button.hpp"
-#include "ui/label.hpp"
+#include "mbuoy/view.hpp"
+#include "mbuoy/ui/button.hpp"
+#include "mbuoy/ui/label.hpp"
+
+#include <cstdio>
 
 void drawButton(const mbuoy::position& pos, const mbuoy::dimensions& dim)
 {
@@ -21,6 +23,7 @@ int main()
             mbuoy::dimensions(40, 40),
             mbuoy::ondraw(drawButton)>{}
     >;
+
     test.render();
 }
 
diff --git a/attr/dimensions.hpp b/mbuoy/attr/dimensions.hpp
similarity index 100%
rename from attr/dimensions.hpp
rename to mbuoy/attr/dimensions.hpp
diff --git a/attr/ondraw.hpp b/mbuoy/attr/ondraw.hpp
similarity index 100%
rename from attr/ondraw.hpp
rename to mbuoy/attr/ondraw.hpp
diff --git a/attr/position.hpp b/mbuoy/attr/position.hpp
similarity index 100%
rename from attr/position.hpp
rename to mbuoy/attr/position.hpp
diff --git a/attr/string.hpp b/mbuoy/attr/string.hpp
similarity index 100%
rename from attr/string.hpp
rename to mbuoy/attr/string.hpp
diff --git a/find.hpp b/mbuoy/find.hpp
similarity index 100%
rename from find.hpp
rename to mbuoy/find.hpp
diff --git a/port.hpp b/mbuoy/port.hpp
similarity index 100%
rename from port.hpp
rename to mbuoy/port.hpp
diff --git a/ui/button.hpp b/mbuoy/ui/button.hpp
similarity index 78%
rename from ui/button.hpp
rename to mbuoy/ui/button.hpp
index 4a0a9f5..c6e5b66 100644
--- a/ui/button.hpp
+++ b/mbuoy/ui/button.hpp
@@ -1,12 +1,12 @@
 #ifndef MBUOY_UI_BUTTON_HPP
 #define MBUOY_UI_BUTTON_HPP
 
-#include "attr/dimensions.hpp"
-#include "attr/ondraw.hpp"
-#include "attr/position.hpp"
-#include "attr/string.hpp"
-#include "find.hpp"
-#include "port.hpp"
+#include "../attr/dimensions.hpp"
+#include "../attr/ondraw.hpp"
+#include "../attr/position.hpp"
+#include "../attr/string.hpp"
+#include "../find.hpp"
+#include "../port.hpp"
 
 namespace mbuoy {
 
diff --git a/ui/label.hpp b/mbuoy/ui/label.hpp
similarity index 82%
rename from ui/label.hpp
rename to mbuoy/ui/label.hpp
index 9524007..c6cc581 100644
--- a/ui/label.hpp
+++ b/mbuoy/ui/label.hpp
@@ -1,10 +1,10 @@
 #ifndef MBUOY_UI_LABEL_HPP
 #define MBUOY_UI_LABEL_HPP
 
-#include "attr/position.hpp"
-#include "attr/string.hpp"
-#include "find.hpp"
-#include "port.hpp"
+#include "../attr/position.hpp"
+#include "../attr/string.hpp"
+#include "../find.hpp"
+#include "../port.hpp"
 
 namespace mbuoy {
 
diff --git a/view.hpp b/mbuoy/view.hpp
similarity index 100%
rename from view.hpp
rename to mbuoy/view.hpp