diff --git a/cantedraw.asd b/cantedraw.asd
index c3dcc4e..e3b64b4 100644
--- a/cantedraw.asd
+++ b/cantedraw.asd
@@ -1,10 +1,14 @@
 (asdf:defsystem :cantedraw
   :depends-on (:alexandria)
   :components ((:file "packages")
-               (:file "lib.macros")
-               (:file "lib.functions")
-               (:file "model")
-               (:file "main"))
+               (:module "lib"
+                :components
+                ((:file "macros")
+                 (:file "functions")))
+               (:module "src"
+                :components
+                ((:file "model")
+                 (:file "main"))))
   :build-operation "program-op"
   :build-pathname "bin/cantedraw"
   :entry-point "cantedraw.main:start")
diff --git a/lib.functions.lisp b/lib/functions.lisp
similarity index 100%
rename from lib.functions.lisp
rename to lib/functions.lisp
diff --git a/lib.macros.lisp b/lib/macros.lisp
similarity index 100%
rename from lib.macros.lisp
rename to lib/macros.lisp
diff --git a/main.lisp b/src/main.lisp
similarity index 100%
rename from main.lisp
rename to src/main.lisp
diff --git a/model.lisp b/src/model.lisp
similarity index 100%
rename from model.lisp
rename to src/model.lisp