diff --git a/lisp/interfaces/view-interface.lisp b/lisp/interfaces/view-interface.lisp
index 4dd5028..576aec6 100644
--- a/lisp/interfaces/view-interface.lisp
+++ b/lisp/interfaces/view-interface.lisp
@@ -1,3 +1,8 @@
+(defpackage #:mahogany/wm-interface
+  (:use :cl)
+  (:export #:set-position
+	   #:set-dimensions))
+
 (in-package #:mahogany/wm-interface)
 
 (defclass view ()
diff --git a/lisp/keyboard/package.lisp b/lisp/keyboard/package.lisp
new file mode 100644
index 0000000..53599fd
--- /dev/null
+++ b/lisp/keyboard/package.lisp
@@ -0,0 +1,24 @@
+(defpackage #:mahogany/keyboard
+  (:use :cl
+	#:alexandria
+	#:mahogany/log
+	#:mahogany/util)
+  (:export #:key
+	   #:make-key
+	   #:print-key
+	   #:key-keysym
+	   #:key-modifier-mask
+	   #:key-modifier-key-p
+	   #:parse-key
+	   #:kbd
+	   #:kbd-parse-error
+	   #:define-kmap
+	   #:define-key
+	   #:kmap-p
+	   #:kmap
+	   #:kmap-lookup
+	   #:key-state
+	   #:make-key-state
+	   #:key-state-sequence
+	   #:key-state-advance
+	   #:key-state-active-p))
diff --git a/lisp/package.lisp b/lisp/package.lisp
index 3949212..46cba6e 100644
--- a/lisp/package.lisp
+++ b/lisp/package.lisp
@@ -1,78 +1,3 @@
-(defpackage #:mahogany/wm-interface
-  (:use :cl)
-  (:export #:view ; view interface
-	   #:view-x
-	   #:view-y
-	   #:view-opacity
-	   #:set-dimensions))
-
-(defpackage #:mahogany/tree
-  (:use :cl
-	#:alexandria
-	#:iterate
-	#:mahogany/log
-	#:mahogany/util
-	#:mahogany/wm-interface)
-  (:export #:*split-frame-hook*
-	   #:*new-frame-hook*
-	   #:*remove-split-hook*
-	   #:*new-split-type*
-	   #:frame
-	   #:frame-at
-	   #:frame-x
-	   #:frame-y
-	   #:frame-width
-	   #:frame-height
-	   #:frame-parent
-	   #:tree-container
-	   #:make-basic-tree
-	   #:root-tree
-	   #:tree-frame
-	   #:tree-children
-	   #:tree-split-direction
-	   #:binary-tree-frame
-	   #:poly-tree-frame
-	   #:split-frame-v
-	   #:split-frame-h
-	   #:remove-frame
-	   #:swap-positions
-	   #:find-empty-frame
-	   #:get-empty-frames
-	   #:get-populated-frames
-	   #:root-frame-p
-	   #:view-frame
-	   #:frame-view
-	   #:frame-modes
-	   #:fit-view-into-frame
-	   #:leafs-in
-	   #:set-dimensions
-	   #:set-position))
-
-(defpackage #:mahogany/keyboard
-  (:use :cl
-	#:alexandria
-	#:mahogany/log
-	#:mahogany/util)
-  (:export #:key
-	   #:make-key
-	   #:print-key
-	   #:key-keysym
-	   #:key-modifier-mask
-	   #:key-modifier-key-p
-	   #:parse-key
-	   #:kbd
-	   #:kbd-parse-error
-	   #:define-kmap
-	   #:define-key
-	   #:kmap-p
-	   #:kmap
-	   #:kmap-lookup
-	   #:key-state
-	   #:make-key-state
-	   #:key-state-sequence
-	   #:key-state-advance
-	   #:key-state-active-p))
-
 (defpackage #:mahogany
   (:use :cl
 	#:alexandria
diff --git a/lisp/tree/package.lisp b/lisp/tree/package.lisp
new file mode 100644
index 0000000..bb54976
--- /dev/null
+++ b/lisp/tree/package.lisp
@@ -0,0 +1,41 @@
+(defpackage #:mahogany/tree
+  (:use :cl
+	#:alexandria
+	#:iterate
+	#:mahogany/log
+	#:mahogany/util
+	#:mahogany/wm-interface)
+  (:export #:*split-frame-hook*
+	   #:*new-frame-hook*
+	   #:*remove-split-hook*
+	   #:*new-split-type*
+	   #:frame
+	   #:frame-at
+	   #:frame-x
+	   #:frame-y
+	   #:frame-width
+	   #:frame-height
+	   #:frame-parent
+	   #:tree-container
+	   #:make-basic-tree
+	   #:root-tree
+	   #:tree-frame
+	   #:tree-children
+	   #:tree-split-direction
+	   #:binary-tree-frame
+	   #:poly-tree-frame
+	   #:split-frame-v
+	   #:split-frame-h
+	   #:remove-frame
+	   #:swap-positions
+	   #:find-empty-frame
+	   #:get-empty-frames
+	   #:get-populated-frames
+	   #:root-frame-p
+	   #:view-frame
+	   #:frame-view
+	   #:frame-modes
+	   #:fit-view-into-frame
+	   #:leafs-in
+	   #:set-dimensions
+	   #:set-position))
diff --git a/mahogany.asd b/mahogany.asd
index fa30e7c..6dc99f4 100644
--- a/mahogany.asd
+++ b/mahogany.asd
@@ -19,27 +19,28 @@
   :components ((:file "log")
 	       (:file "util")
 	       (:file "system")
+	       (:module interfaces
+			:components ((:file "view-interface")))
 	       (:module bindings
-			:serial t
+		        :serial t
+			:depends-on ("interfaces")
 			:components ((:file "package")
 				     (:file "hrt-libs")
 				     (:file "hrt-bindings")
 				     (:file "wrappers")))
-	       (:file "package")
-	       (:module interfaces
-			:depends-on ("package")
-			:components ((:file "view-interface")
-				     ))
 	       (:module keyboard
-			:depends-on ("package" "util")
-			:components ((:file "keytrans")
+			:depends-on ("util")
+		        :components ((:file "package")
+				     (:file "keytrans")
 				     (:file "key")
 				     (:file "kmap")))
 	       (:module tree
-			:depends-on ("package" "log" "util" "interfaces")
-	       		:components ((:file "tree-interface")
+			:depends-on ("log" "util" "interfaces")
+	       	        :components ((:file "package")
+				     (:file "tree-interface")
 	       			     (:file "frame" :depends-on ("tree-interface"))
 				     (:file "view" :depends-on ("tree-interface"))))
+	       (:file "package")
 	       (:file "objects" :depends-on ("package"))
 	       (:file "group" :depends-on ("objects" "bindings"))
 	       (:file "state" :depends-on ("objects" "keyboard"))