diff --git a/chatdir-inotify.egg b/chatdir-inotify.egg
new file mode 100644
index 0000000..694896a
--- /dev/null
+++ b/chatdir-inotify.egg
@@ -0,0 +1,8 @@
+;; -*- Scheme -*-
+((synopsis "A simple Chatdir input-loop.")
+ (author "Jaidyn Ann")
+ (category net)
+ (license "GPLv3")
+ (dependencies srfi-1 inotify)
+ (components
+  (extension chatdir-inotify (source "inotify.scm"))))
diff --git a/chatdir.egg b/chatdir.egg
new file mode 100644
index 0000000..c1bf927
--- /dev/null
+++ b/chatdir.egg
@@ -0,0 +1,8 @@
+;; -*- Scheme -*-
+((synopsis "Interface with Chatdir directories")
+ (author "Jaidyn Ann")
+ (category net)
+ (license "GPLv3")
+ (dependencies srfi-1 srfi-13 srfi-19 xattr)
+ (components
+  (extension chatdir)))
diff --git a/chatdir.scm b/chatdir.scm
index e7b1337..61ea882 100644
--- a/chatdir.scm
+++ b/chatdir.scm
@@ -14,9 +14,21 @@
 ;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 ;;
 
+(module chatdir
+(channels channel-add! channel-cleanup!
+ channel-metadata-set! channel-metadata-get channel-metadata-get* channel-metadata
+ user-add! user-file-set! user-file-get
+ user-enable-state! user-disable-state! user-toggle-states!
+ channel-users channel-user-add! channel-user-file-set! channel-user-file-get
+ channel-user-disable-state! channel-user-enable-state! channel-user-toggle-states!
+ channel-message-add! channel-messages
+ channel-messages-by-xattr channel-messages-by-sender
+ channel-messages-by-date channel-messages-by-date* channel-messages-by-date-range
+ )
+
 (import scheme
-        (chicken file) (chicken file posix) (chicken pathname) (chicken io)
-        (chicken random) (chicken string)
+        (chicken file) (chicken file posix) (chicken pathname) (chicken port)
+        (chicken io) (chicken random) (chicken string)
         srfi-1 srfi-13  srfi-19
         (prefix xattr xattr:))
 
@@ -382,3 +394,4 @@
     (lambda (in-port)
       (read-string #f in-port))))
 
+) ;; chatdir module
diff --git a/inotify.scm b/inotify.scm
index 7781107..24b011e 100644
--- a/inotify.scm
+++ b/inotify.scm
@@ -15,8 +15,12 @@
 ;; along with this program. If not, see <https://www.gnu.org/licenses/>.
 ;;
 
+(module chatdir-inotify
+(input-loop input-loop-init)
+
 (import scheme
-		(chicken file) (chicken io) (chicken pathname)
+		(chicken base) (chicken condition) (chicken file) (chicken io)
+        (chicken pathname)
 		srfi-1
         (prefix inotify inotify:))
 
@@ -172,3 +176,4 @@
 ;; 🎵 Symbolic links cannot have extended attributes, and that is a war-crime. 🎶
 ;; 🎵 Directories cannot have extended attributes, and that is a war-crime. 🎶
 
+) ;; chatdir-inotify module