diff --git a/examples/builder.rs b/examples/builder.rs
index 75add19..e91a6ac 100644
--- a/examples/builder.rs
+++ b/examples/builder.rs
@@ -11,8 +11,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         None,
         &ctx,
     )?
-    .set_urgency(libnotify_rs::notification::Urgency::Critical)
-    .set_timeout(libnotify_rs::notification::Timeout::Never)
+    .set_urgency(libnotify_rs::api::notification::Urgency::Critical)
+    .set_timeout(libnotify_rs::api::notification::Timeout::Never)
     .set_category("Coffee")?;
 
     notification_builder.show()?;
diff --git a/examples/callbacks.rs b/examples/callbacks.rs
index f4c2d4a..3be1ff7 100644
--- a/examples/callbacks.rs
+++ b/examples/callbacks.rs
@@ -1,7 +1,7 @@
 use glib::MainLoop;
 use libnotify_rs::{
-    functions::{init, uninit},
-    notification::Notification,
+    api::functions::{init, uninit},
+    api::notification::Notification,
 };
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
diff --git a/examples/server_info.rs b/examples/server_info.rs
index 03a3f94..d6d5a3f 100644
--- a/examples/server_info.rs
+++ b/examples/server_info.rs
@@ -1,4 +1,4 @@
-use libnotify_rs::functions::{self, uninit};
+use libnotify_rs::api::functions::{self, uninit};
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
     functions::init("Morbius")?;
diff --git a/examples/show_notification.rs b/examples/show_notification.rs
index 5d755f3..27aeaa9 100644
--- a/examples/show_notification.rs
+++ b/examples/show_notification.rs
@@ -1,6 +1,6 @@
-use libnotify_rs::{
+use libnotify_rs::api::{
     functions::{init, uninit},
-    notification::Notification,
+    notification::{self, Notification},
 };
 
 fn main() -> Result<(), Box<dyn std::error::Error>> {
@@ -11,8 +11,8 @@ fn main() -> Result<(), Box<dyn std::error::Error>> {
         None,
     )?;
 
-    notify.set_timeout(libnotify_rs::notification::Timeout::Custom(1000 * 10)); // 10 secs
-    notify.set_urgency(libnotify_rs::notification::Urgency::Critical); // coffee is very important
+    notify.set_timeout(notification::Timeout::Custom(1000 * 10)); // 10 secs
+    notify.set_urgency(notification::Urgency::Critical); // coffee is very important
     notify.set_category("Coffee")?;
 
     notify.show()?;
diff --git a/src/functions.rs b/src/api/functions.rs
similarity index 98%
rename from src/functions.rs
rename to src/api/functions.rs
index ba234fe..7346ede 100644
--- a/src/functions.rs
+++ b/src/api/functions.rs
@@ -1,6 +1,6 @@
-use crate::utils::c_str_to_rs_str_and_free;
+use super::utils::c_str_to_rs_str_and_free;
 
-use crate::libnotify::*;
+use super::libnotify::*;
 
 /* Initting
  *
diff --git a/src/libnotify.rs b/src/api/libnotify.rs
similarity index 100%
rename from src/libnotify.rs
rename to src/api/libnotify.rs
diff --git a/src/api/mod.rs b/src/api/mod.rs
new file mode 100644
index 0000000..acca172
--- /dev/null
+++ b/src/api/mod.rs
@@ -0,0 +1,4 @@
+pub mod functions;
+mod libnotify;
+pub mod notification;
+mod utils;
diff --git a/src/notification.rs b/src/api/notification.rs
similarity index 99%
rename from src/notification.rs
rename to src/api/notification.rs
index e195bd9..5f53c29 100644
--- a/src/notification.rs
+++ b/src/api/notification.rs
@@ -1,4 +1,4 @@
-use crate::libnotify::*;
+use super::libnotify::*;
 
 #[derive(Debug, Clone, Copy)]
 pub enum Urgency {
diff --git a/src/utils.rs b/src/api/utils.rs
similarity index 82%
rename from src/utils.rs
rename to src/api/utils.rs
index 59be103..fbbd2d1 100644
--- a/src/utils.rs
+++ b/src/api/utils.rs
@@ -7,7 +7,7 @@ pub unsafe fn c_str_to_rs_str_and_free(c_str: *mut std::os::raw::c_char) -> Opti
         .to_string_lossy()
         .to_string();
 
-    unsafe { crate::libnotify::g_free(c_str as *mut std::ffi::c_void) };
+    unsafe { super::libnotify::g_free(c_str as *mut std::ffi::c_void) };
 
     Some(normal_string)
 }
diff --git a/src/lib.rs b/src/lib.rs
index 8029fef..355823d 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -3,9 +3,7 @@
 #![allow(non_camel_case_types)]
 #![allow(non_snake_case)]
 
-pub mod builder;
-pub mod context;
-pub mod functions;
-mod libnotify;
-pub mod notification;
-mod utils;
+pub mod api;
+pub mod wrappers;
+
+pub use wrappers::{builder, context};
diff --git a/src/builder.rs b/src/wrappers/builder.rs
similarity index 95%
rename from src/builder.rs
rename to src/wrappers/builder.rs
index 2ae379a..05d0110 100644
--- a/src/builder.rs
+++ b/src/wrappers/builder.rs
@@ -1,6 +1,6 @@
 use crate::{
-    context::LibnotifyContext,
-    notification::{HintValue, Notification, Timeout, Urgency},
+    api::notification::{HintValue, Notification, Timeout, Urgency},
+    wrappers::context::LibnotifyContext,
 };
 
 pub struct NotificationBuilder<'a> {
diff --git a/src/context.rs b/src/wrappers/context.rs
similarity index 92%
rename from src/context.rs
rename to src/wrappers/context.rs
index fb0ab63..16f47f9 100644
--- a/src/context.rs
+++ b/src/wrappers/context.rs
@@ -1,4 +1,4 @@
-use crate::functions::{init, is_initted, set_app_icon, set_app_name, uninit};
+use crate::api::functions::{init, is_initted, set_app_icon, set_app_name, uninit};
 
 pub struct LibnotifyContext {}
 
diff --git a/src/wrappers/mod.rs b/src/wrappers/mod.rs
new file mode 100644
index 0000000..55a1200
--- /dev/null
+++ b/src/wrappers/mod.rs
@@ -0,0 +1,2 @@
+pub mod builder;
+pub mod context;