diff --git a/dev.metalisp.sbt.asd b/dev.metalisp.sbt.asd
index e36dac5..54f572b 100644
--- a/dev.metalisp.sbt.asd
+++ b/dev.metalisp.sbt.asd
@@ -10,18 +10,9 @@
                 ((:file "main")
                  (:file "translate")
                  (:file "utility")
-                 (:file "bi")))
-               (:module "src/layout"
-                :depends-on ("src")
-                :components
-                ((:file "grid")))
-               (:module "src/component"
-                ;;
-                ;; Components are the building blocks for Patterns
-                ;;
-                :depends-on ("src")
-                :components
-                ((:file "accordion")
+                 (:file "bi")
+                 (:file "grid")
+                 (:file "accordion")
                  (:file "alert")
                  (:file "badge")
                  (:file "button")
@@ -33,20 +24,9 @@
                  (:file "pagination")
                  (:file "table")
                  (:file "spinner")
-                 (:file "form")))
-               (:module "src/pattern"
-                ;;
-                ;; Patterns are built on top of components and define their own
-                ;; DSL to create specific things
-                ;;
-                :depends-on ("src" "src/component")
-                :components
-                ((:file "questionnaire")))
+                 (:file "form")
+                 (:file "questionnaire")))
                (:module "examples"
-                ;;
-                ;; Examples show how different patterns work together
-                ;;
-                :depends-on ("src/pattern")
                 :components
                 ((:file "album"))))
   :description "A Common Lisp library for generating Bootstrap-based HTML markup. It provides macros to easily create Bootstrap components such as accordions, alerts, badges, buttons, cards, dropdowns, headers, list groups, navbars, nav-tabs, pagination, and tables. This library is dependent on the Spinneret library for HTML generation."
diff --git a/src/component/accordion.lisp b/src/accordion.lisp
similarity index 100%
rename from src/component/accordion.lisp
rename to src/accordion.lisp
diff --git a/src/component/alert.lisp b/src/alert.lisp
similarity index 100%
rename from src/component/alert.lisp
rename to src/alert.lisp
diff --git a/src/component/badge.lisp b/src/badge.lisp
similarity index 100%
rename from src/component/badge.lisp
rename to src/badge.lisp
diff --git a/src/component/button.lisp b/src/button.lisp
similarity index 100%
rename from src/component/button.lisp
rename to src/button.lisp
diff --git a/src/component/card.lisp b/src/card.lisp
similarity index 100%
rename from src/component/card.lisp
rename to src/card.lisp
diff --git a/src/component/dropdown.lisp b/src/dropdown.lisp
similarity index 100%
rename from src/component/dropdown.lisp
rename to src/dropdown.lisp
diff --git a/src/component/form.lisp b/src/form.lisp
similarity index 100%
rename from src/component/form.lisp
rename to src/form.lisp
diff --git a/src/layout/grid.lisp b/src/grid.lisp
similarity index 100%
rename from src/layout/grid.lisp
rename to src/grid.lisp
diff --git a/src/component/header.lisp b/src/header.lisp
similarity index 100%
rename from src/component/header.lisp
rename to src/header.lisp
diff --git a/src/component/list-group.lisp b/src/list-group.lisp
similarity index 100%
rename from src/component/list-group.lisp
rename to src/list-group.lisp
diff --git a/src/component/nav-tab.lisp b/src/nav-tab.lisp
similarity index 100%
rename from src/component/nav-tab.lisp
rename to src/nav-tab.lisp
diff --git a/src/component/navbar.lisp b/src/navbar.lisp
similarity index 100%
rename from src/component/navbar.lisp
rename to src/navbar.lisp
diff --git a/src/component/pagination.lisp b/src/pagination.lisp
similarity index 100%
rename from src/component/pagination.lisp
rename to src/pagination.lisp
diff --git a/src/pattern/questionnaire.lisp b/src/questionnaire.lisp
similarity index 100%
rename from src/pattern/questionnaire.lisp
rename to src/questionnaire.lisp
diff --git a/src/component/spinner.lisp b/src/spinner.lisp
similarity index 100%
rename from src/component/spinner.lisp
rename to src/spinner.lisp
diff --git a/src/component/table.lisp b/src/table.lisp
similarity index 100%
rename from src/component/table.lisp
rename to src/table.lisp