diff --git a/modules/welcome-bot.lisp b/scripts/welcome-bot.lisp
similarity index 88%
rename from modules/welcome-bot.lisp
rename to scripts/welcome-bot.lisp
index 60b0f20..15e4c1e 100644
--- a/modules/welcome-bot.lisp
+++ b/scripts/welcome-bot.lisp
@@ -24,15 +24,14 @@
 (define-constant +table-id+ "welcome-minimum-id" :test #'string=)
 
 (defparameter *welcome-message-template* "Hi ~s!~%Enjoy the fediverse!"
-  :test #'string=
-  :documentation "The welcome message, the '~s' is replaced with the display-name
+  "The welcome message, the '~s' is replaced with the display-name
 of the welcomed user")
 
 (defun make-table-last-id ()
-  (db-utils:query-low-level (strcat (db::prepare-table +table-id+
+  (db-utils:query-low-level (strcat (db:prepare-table +table-id+
                                                        :autogenerated-id-p nil)
                                     " id TEXT"
-                                    db::+make-close+)))
+                                    db:+make-close+)))
 
 (defun dump-minimum-id (minimum-id)
   (db-utils:query (db-utils:make-insert :welcome-minimum-id (:id) (minimum-id))))
@@ -57,9 +56,9 @@ of the welcomed user")
     (let ((minimum-id (minimum-id)))
       (assert (or (stringp minimum-id)
                   (null    minimum-id)))
-      (let* ((toots      (api-client::sort-id< (api-client:get-timeline :public
-                                                                        :local  t
-                                                                        :min-id minimum-id)))
+      (let* ((toots      (api-client:sort-id< (api-client:get-timeline :public
+                                                                       :local  t
+                                                                       :min-id minimum-id)))
              (last-toot  (lastcar toots)))
         (when last-toot
           (dump-minimum-id (tooter:id last-toot))
diff --git a/src/package.lisp b/src/package.lisp
index 029b365..6c65034 100644
--- a/src/package.lisp
+++ b/src/package.lisp
@@ -743,6 +743,8 @@
    :+default-converation-timeline+
    :+message-index-start+
    :+tag-separator+
+   :+make-close+
+   :prepare-table
    :hidden-recipient-p
    :default-timelines
    :message-index->sequence-index
@@ -1415,6 +1417,7 @@
    :poll-vote
    :get-notifications
    :delete-notification
+   :sort-id<
    :all-mentions
    :update-mentions-folder
    :expand-status-thread