diff --git a/source/clog-helpers.lisp b/source/clog-helpers.lisp
index 06baed0..35b0a2d 100644
--- a/source/clog-helpers.lisp
+++ b/source/clog-helpers.lisp
@@ -13,6 +13,9 @@
 (defpackage #:clog-user
   (:use #:cl #:clog))
 
+(defpackage #:clog-tools
+  (:use #:cl #:clog #:clog-gui))
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 ;; Implementation - CLOG Utilities
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
diff --git a/tools/clog-builder.lisp b/tools/clog-builder.lisp
index 36801a1..9d2cb26 100644
--- a/tools/clog-builder.lisp
+++ b/tools/clog-builder.lisp
@@ -1,8 +1,5 @@
-(defpackage #:clog-tools
-  (:use #:cl #:clog #:clog-gui)
-  (:export clog-builder))
-
 (in-package :clog-tools)
+(export 'clog-builder)
 
 (defvar supported-controls
   (list
diff --git a/tools/clog-db-admin.lisp b/tools/clog-db-admin.lisp
index 1a618b7..498752c 100644
--- a/tools/clog-db-admin.lisp
+++ b/tools/clog-db-admin.lisp
@@ -1,8 +1,5 @@
-(defpackage #:clog-tools
-  (:use #:cl #:clog #:clog-gui)
-  (:export clog-db-admin))
-
 (in-package :clog-tools)
+(export 'clog-db-admin)
 
 (defclass app-data ()
   ((body