diff --git a/CMakeLists.txt b/CMakeLists.txt
index f50b38b..7259170 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,18 @@ set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
 # Library target
-add_subdirectory(src)
+add_library(
+  ${PROJECT_NAME}
+  INTERFACE
+)
+
+target_include_directories(
+  ${PROJECT_NAME}
+  INTERFACE
+  "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
+  "$<INSTALL_INTERFACE:include>"
+)
+
 
 # Optional builds
 option(BUILD_EXAMPLES "Build examples" ON)
diff --git a/examples/example1.cpp b/examples/example1.cpp
index d6d38d3..ecf871e 100644
--- a/examples/example1.cpp
+++ b/examples/example1.cpp
@@ -1,8 +1,8 @@
 #include <iostream>
-
-#include "kiwicpp/library.hpp"
+#include <kiwicpp/kiwicpp.hpp>
+using namespace kiwicpp;
 
 int main() {
-  std::cout << "Sum: " << KiwiCPP::add(2, 3) << std::endl;
+  std::cout << "Sum: " << add(2, 3) << std::endl;
   return 0;
-}
\ No newline at end of file
+}
diff --git a/include/kiwicpp/kiwicpp.hpp b/include/kiwicpp/kiwicpp.hpp
new file mode 100644
index 0000000..067b38c
--- /dev/null
+++ b/include/kiwicpp/kiwicpp.hpp
@@ -0,0 +1,3 @@
+#pragma once
+
+#include <kiwicpp/math.hpp>
diff --git a/include/kiwicpp/library.hpp b/include/kiwicpp/library.hpp
deleted file mode 100644
index 694f728..0000000
--- a/include/kiwicpp/library.hpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-namespace KiwiCPP {
-int add(int a, int b);
-}  // namespace KiwiCPP
\ No newline at end of file
diff --git a/include/kiwicpp/math.hpp b/include/kiwicpp/math.hpp
new file mode 100644
index 0000000..cea454f
--- /dev/null
+++ b/include/kiwicpp/math.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+namespace kiwicpp {
+inline int add(int a, int b) { return a + b; }
+}  // namespace kiwicpp
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
deleted file mode 100644
index 5d5a861..0000000
--- a/src/CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
-add_library(
-  ${PROJECT_NAME}
-  library.cpp
-)
-
-target_include_directories(
-  ${PROJECT_NAME}
-  PUBLIC
-  "$<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/include>"
-  "$<INSTALL_INTERFACE:include>"
-)
diff --git a/src/library.cpp b/src/library.cpp
deleted file mode 100644
index a23f3fe..0000000
--- a/src/library.cpp
+++ /dev/null
@@ -1,5 +0,0 @@
-#include "../include/kiwicpp/library.hpp"
-
-namespace KiwiCPP {
-int add(int a, int b) { return a + b; }
-}  // namespace KiwiCPP
diff --git a/tests/test_library.cpp b/tests/test_library.cpp
index 2cdc9f7..ac01d99 100644
--- a/tests/test_library.cpp
+++ b/tests/test_library.cpp
@@ -1,11 +1,12 @@
 #include <gtest/gtest.h>
 
-#include "../include/kiwicpp/library.hpp"
+#include <kiwicpp/kiwicpp.hpp>
+using namespace kiwicpp;
 
 TEST(LibraryTest, Add) {
   // Consider adding more test cases
-  EXPECT_EQ(KiwiCPP::add(2, 3), 5);
-  EXPECT_EQ(KiwiCPP::add(-1, 1), 0);
-  EXPECT_EQ(KiwiCPP::add(0, 0), 0);
-  EXPECT_EQ(KiwiCPP::add(-2, -3), -5);
+  EXPECT_EQ(add(2, 3), 5);
+  EXPECT_EQ(add(-1, 1), 0);
+  EXPECT_EQ(add(0, 0), 0);
+  EXPECT_EQ(add(-2, -3), -5);
 }