Move util modules into calp module..

93 files changed, 151 insertions, 151 deletions

diff --git a/config.scm b/config.scm
index ac20024e..4092ecb3 100644
--- a/config.scm
+++ b/config.scm
@@ -10,7 +10,7 @@
              (sxml simple)
              (glob)
 
-             (util config)
+             (calp util config)
 
              (datetime)
 
diff --git a/module/c/cpp.scm b/module/c/cpp.scm
index 062e50f5..070ea4f6 100644
--- a/module/c/cpp.scm
+++ b/module/c/cpp.scm
@@ -1,13 +1,13 @@
 (define-module (c cpp)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 popen)
   :use-module (ice-9 match)
   :use-module (ice-9 regex)
   :use-module ((rnrs io ports) :select (call-with-port))
   :use-module (ice-9 pretty-print) ; used by one error handler
-  :use-module ((util io) :select (read-lines))
-  :use-module (util graph)
+  :use-module ((calp util io) :select (read-lines))
+  :use-module (calp util graph)
   :use-module (c lex)
   :use-module (c parse)
   :use-module (c operators)
diff --git a/module/c/parse.scm b/module/c/parse.scm
index 42f2c13a..bef7e66d 100644
--- a/module/c/parse.scm
+++ b/module/c/parse.scm
@@ -1,5 +1,5 @@
 (define-module (c parse)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 match)
   :export (parse-lexeme-tree))
diff --git a/module/calp/benchmark/parse.scm b/module/calp/benchmark/parse.scm
index e9bc509f..f1be66f5 100644
--- a/module/calp/benchmark/parse.scm
+++ b/module/calp/benchmark/parse.scm
@@ -1,5 +1,5 @@
 (define-module (calp benchmark parse)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (glob)
   :use-module (statprof)
 
diff --git a/module/calp/entry-points/benchmark.scm b/module/calp/entry-points/benchmark.scm
index 7706f6f0..851edc59 100644
--- a/module/calp/entry-points/benchmark.scm
+++ b/module/calp/entry-points/benchmark.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points benchmark)
-  :use-module (util)
+  :use-module (calp util)
 
   :use-module (ice-9 getopt-long)
-  :use-module (util options)
+  :use-module (calp util options)
   :use-module ((srfi srfi-41) :select (stream->list))
 
   :use-module ((vcomponent instance methods) :select (get-event-set))
diff --git a/module/calp/entry-points/html.scm b/module/calp/entry-points/html.scm
index 8c400e1d..39f00979 100644
--- a/module/calp/entry-points/html.scm
+++ b/module/calp/entry-points/html.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points html)
   :export (main)
-  :use-module (util)
-  :use-module (util time)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util time)
+  :use-module (calp util options)
   :use-module (datetime)
   :use-module (ice-9 getopt-long)
   :use-module ((ice-9 regex) :select (string-match regexp-substitute))
@@ -91,7 +91,7 @@
   (define calendars (get-calendars global-event-object))
   (define events (get-event-set global-event-object))
 
-  ((@ (util time) report-time!) "html start")
+  ((@ (calp util time) report-time!) "html start")
 
   (create-files target-directory)
 
@@ -168,5 +168,5 @@
     [else
      (error "Unknown html style: ~a" style)])
 
-  ((@ (util time) report-time!) "all done")
+  ((@ (calp util time) report-time!) "all done")
   )
diff --git a/module/calp/entry-points/ical.scm b/module/calp/entry-points/ical.scm
index 0b6a0535..15e677b5 100644
--- a/module/calp/entry-points/ical.scm
+++ b/module/calp/entry-points/ical.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points ical)
   :export (main)
-  :use-module (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util options)
   :use-module (vcomponent ical output)
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
diff --git a/module/calp/entry-points/import.scm b/module/calp/entry-points/import.scm
index e8c46ea8..f25e642f 100644
--- a/module/calp/entry-points/import.scm
+++ b/module/calp/entry-points/import.scm
@@ -1,7 +1,7 @@
 (define-module (calp entry-points import)
   :export (main)
-  :use-module (util)
-  :use-module (util options)
+  :use-module (calp util)
+  :use-module (calp util options)
   :use-module (ice-9 getopt-long)
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-1)
diff --git a/module/calp/entry-points/server.scm b/module/calp/entry-points/server.scm
index 87eaba1e..55f84c1a 100644
--- a/module/calp/entry-points/server.scm
+++ b/module/calp/entry-points/server.scm
@@ -1,8 +1,8 @@
 (define-module (calp entry-points server)
-  :use-module (util)
-  :use-module (util options)
-  :use-module (util exceptions)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util options)
+  :use-module (calp util exceptions)
+  :use-module (calp util config)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/entry-points/terminal.scm b/module/calp/entry-points/terminal.scm
index fa035e7a..5aaa1f2d 100644
--- a/module/calp/entry-points/terminal.scm
+++ b/module/calp/entry-points/terminal.scm
@@ -5,7 +5,7 @@
   :use-module (ice-9 getopt-long)
   :use-module (datetime)
   :use-module (vulgar)
-  :use-module (util options)
+  :use-module (calp util options)
   )
 
 (define options
diff --git a/module/calp/entry-points/text.scm b/module/calp/entry-points/text.scm
index 04f57a31..6da524ae 100644
--- a/module/calp/entry-points/text.scm
+++ b/module/calp/entry-points/text.scm
@@ -2,8 +2,8 @@
   :export (main)
   :use-module (text flow)
   :use-module (ice-9 getopt-long)
-  :use-module (util io)
-  :use-module (util options)
+  :use-module (calp util io)
+  :use-module (calp util options)
   )
 
 
diff --git a/module/calp/html/caltable.scm b/module/calp/html/caltable.scm
index 65a70252..2f5a6d31 100644
--- a/module/calp/html/caltable.scm
+++ b/module/calp/html/caltable.scm
@@ -1,5 +1,5 @@
 (define-module (calp html caltable)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (calp html util)
   :use-module (datetime)
   :use-module (srfi srfi-41)
diff --git a/module/calp/html/components.scm b/module/calp/html/components.scm
index 49f00e52..ebc359b8 100644
--- a/module/calp/html/components.scm
+++ b/module/calp/html/components.scm
@@ -1,6 +1,6 @@
 (define-module (calp html components)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :export (xhtml-doc)
   )
 
diff --git a/module/calp/html/config.scm b/module/calp/html/config.scm
index 6f156c98..081777ac 100644
--- a/module/calp/html/config.scm
+++ b/module/calp/html/config.scm
@@ -1,6 +1,6 @@
 (define-module (calp html config)
-  :use-module (util)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util config)
   )
 
 (define-public debug (make-parameter #f))
diff --git a/module/calp/html/util.scm b/module/calp/html/util.scm
index 8410472c..cd5aaeab 100644
--- a/module/calp/html/util.scm
+++ b/module/calp/html/util.scm
@@ -1,6 +1,6 @@
 (define-module (calp html util)
   :use-module ((base64) :select (base64encode base64decode))
-  :use-module (util))
+  :use-module (calp util))
 
 ;;; @var{html-attr} & @var{html-unattr} used to just strip any
 ;;; attributes not valid in css. That allowed a human reader to
diff --git a/module/calp/html/vcomponent.scm b/module/calp/html/vcomponent.scm
index be6b6166..3a2bd3cc 100644
--- a/module/calp/html/vcomponent.scm
+++ b/module/calp/html/vcomponent.scm
@@ -1,5 +1,5 @@
 (define-module (calp html vcomponent)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
@@ -7,7 +7,7 @@
   :use-module (calp html util)
   :use-module ((calp html config) :select (edit-mode))
   :use-module ((calp html components) :select (btn tabset))
-  :use-module ((util color) :select (calculate-fg-color))
+  :use-module ((calp util color) :select (calculate-fg-color))
   :use-module ((vcomponent datetime output)
                :select (fmt-time-span
                         format-description
diff --git a/module/calp/html/view/calendar.scm b/module/calp/html/view/calendar.scm
index 67a1a7b5..27edfcb4 100644
--- a/module/calp/html/view/calendar.scm
+++ b/module/calp/html/view/calendar.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
                :select (events-between))
@@ -18,7 +18,7 @@
   :use-module (calp html util)
   :use-module ((calp html caltable) :select (cal-table))
 
-  :use-module (util config)
+  :use-module (calp util config)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
diff --git a/module/calp/html/view/calendar/month.scm b/module/calp/html/view/calendar/month.scm
index ce8957da..0ac69292 100644
--- a/module/calp/html/view/calendar/month.scm
+++ b/module/calp/html/view/calendar/month.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar month)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
diff --git a/module/calp/html/view/calendar/shared.scm b/module/calp/html/view/calendar/shared.scm
index 73698060..fb5eace5 100644
--- a/module/calp/html/view/calendar/shared.scm
+++ b/module/calp/html/view/calendar/shared.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar shared)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (vcomponent)
   :use-module ((vcomponent datetime)
@@ -8,7 +8,7 @@
                         event-length/clamped))
   :use-module ((vcomponent datetime output)
                :select (format-summary))
-  :use-module (util tree)
+  :use-module (calp util tree)
   :use-module (datetime)
   :use-module (calp html config)
   :use-module ((calp html components)
diff --git a/module/calp/html/view/calendar/week.scm b/module/calp/html/view/calendar/week.scm
index ca6aa9f8..111c8f21 100644
--- a/module/calp/html/view/calendar/week.scm
+++ b/module/calp/html/view/calendar/week.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view calendar week)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (datetime)
diff --git a/module/calp/html/view/search.scm b/module/calp/html/view/search.scm
index faefe6dc..3141fa11 100644
--- a/module/calp/html/view/search.scm
+++ b/module/calp/html/view/search.scm
@@ -1,5 +1,5 @@
 (define-module (calp html view search)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent)
   :use-module (vcomponent search)
   :use-module ((ice-9 pretty-print) :select (pretty-print))
diff --git a/module/calp/main.scm b/module/calp/main.scm
index e336846a..39d8f625 100644
--- a/module/calp/main.scm
+++ b/module/calp/main.scm
@@ -1,13 +1,13 @@
 ;; -*- geiser-scheme-implementation: guile -*-
 (define-module (calp main)
-  :use-module (util)
+  :use-module (calp util)
 
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-88)             ; keyword syntax
 
-  :use-module ((util config) :select (set-config! get-config get-configuration-documentation))
-  :use-module (util options)
-  :use-module ((util hooks) :select (shutdown-hook))
+  :use-module ((calp util config) :select (set-config! get-config get-configuration-documentation))
+  :use-module (calp util options)
+  :use-module ((calp util hooks) :select (shutdown-hook))
 
   :use-module ((text markup) :select (sxml->ansi-text))
 
@@ -170,7 +170,7 @@
       ;; (define path (read-line pipe))
       (define line ((@ (ice-9 rdelim) read-line) pipe))
       (define names (string-split line #\space))
-      ((@ (util io) with-atomic-output-to-file)
+      ((@ (calp util io) with-atomic-output-to-file)
        (path-append (xdg-data-home) "/calp/zoneinfo.scm")
        (lambda ()
          (write `(set-config! 'tz-list ',names)) (newline)
@@ -207,7 +207,7 @@
                                  (string->symbol stprof)))))
 
 (define-public (main args)
-  ((@ (util time) report-time!) "Program start")
+  ((@ (calp util time) report-time!) "Program start")
   (dynamic-wind (lambda () 'noop)
                 (lambda () (catch 'return (lambda () (wrapped-main args)) values))
                 (lambda () (run-hook shutdown-hook))))
diff --git a/module/calp/repl.scm b/module/calp/repl.scm
index f43b8fce..d4f087aa 100644
--- a/module/calp/repl.scm
+++ b/module/calp/repl.scm
@@ -5,8 +5,8 @@
 (define-module (calp repl)
   :use-module (system repl server)
   :use-module (ice-9 regex)
-  :use-module ((util hooks) :select (shutdown-hook))
-  :use-module (util exceptions)
+  :use-module ((calp util hooks) :select (shutdown-hook))
+  :use-module (calp util exceptions)
   )
 
 (define-public (repl-start address)
diff --git a/module/calp/server/routes.scm b/module/calp/server/routes.scm
index 51e5acb2..f647b998 100644
--- a/module/calp/server/routes.scm
+++ b/module/calp/server/routes.scm
@@ -1,7 +1,7 @@
 (define-module (calp server routes)
-  :use-module (util)
-  :use-module (util options)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util options)
+  :use-module (calp util exceptions)
 
   :use-module (srfi srfi-1)
 
diff --git a/module/calp/server/server.scm b/module/calp/server/server.scm
index 1ad700f1..ae2117ab 100644
--- a/module/calp/server/server.scm
+++ b/module/calp/server/server.scm
@@ -1,5 +1,5 @@
 (define-module (calp server server)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (web server)
   :use-module ((calp server routes) :select (make-make-routes))
   :use-module (ice-9 threads))
diff --git a/module/calp/terminal.scm b/module/calp/terminal.scm
index fd513a63..7887df5e 100644
--- a/module/calp/terminal.scm
+++ b/module/calp/terminal.scm
@@ -5,7 +5,7 @@
   #:use-module (srfi srfi-26)
   #:use-module (srfi srfi-41)
   #:use-module (srfi srfi-41 util)
-  #:use-module (util)
+  #:use-module (calp util)
   #:use-module (vulgar)
   #:use-module (vulgar info)
   #:use-module (vulgar color)
diff --git a/module/util.scm b/module/calp/util.scm
index c1eaf6bf..25c753dc 100644
--- a/module/util.scm
+++ b/module/calp/util.scm
@@ -1,4 +1,4 @@
-(define-module (util)
+(define-module (calp util)
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-88)           ; postfix keywords
   #:use-module ((ice-9 optargs) #:select (define*-public))
diff --git a/module/util/color.scm b/module/calp/util/color.scm
index 7b6dacec..161e6707 100644
--- a/module/util/color.scm
+++ b/module/calp/util/color.scm
@@ -1,4 +1,4 @@
-(define-module (util color)
+(define-module (calp util color)
   )
 
 ;; Returns a color with good contrast to the given background color.
diff --git a/module/util/config.scm b/module/calp/util/config.scm
index 29269ce5..32dabb69 100644
--- a/module/util/config.scm
+++ b/module/calp/util/config.scm
@@ -4,8 +4,8 @@
 
 ;;; Code:
 
-(define-module (util config)
-  :use-module (util)
+(define-module (calp util config)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 format) ; for format-procedure
   :use-module (ice-9 curried-definitions) ; for ensure
diff --git a/module/util/exceptions.scm b/module/calp/util/exceptions.scm
index f316451d..29e1472c 100644
--- a/module/util/exceptions.scm
+++ b/module/calp/util/exceptions.scm
@@ -1,7 +1,7 @@
-(define-module (util exceptions)
+(define-module (calp util exceptions)
   #:use-module (srfi srfi-1)
-  #:use-module (util)
-  #:use-module (util config)
+  #:use-module (calp util)
+  #:use-module (calp util config)
   #:use-module (ice-9 format)
   #:export (throw-returnable
             catch-multiple
@@ -82,7 +82,7 @@
   `(unless ,form
      (throw 'assertion-error "Assertion for ~a failed, ~a"
             (quote ,form)
-            ((@@ (util exceptions) prettify-tree) ,(cons 'list form)))))
+            ((@@ (calp util exceptions) prettify-tree) ,(cons 'list form)))))
 
 
 (define-syntax catch-warnings
diff --git a/module/util/graph.scm b/module/calp/util/graph.scm
index 999da743..6a01a9ee 100644
--- a/module/util/graph.scm
+++ b/module/calp/util/graph.scm
@@ -4,8 +4,8 @@
 ;; order on symbols in scheme.
 ;;; Code:
 
-(define-module (util graph)
-  :use-module (util)
+(define-module (calp util graph)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu))
 
diff --git a/module/util/hooks.scm b/module/calp/util/hooks.scm
index d4d44ec9..7a784085 100644
--- a/module/util/hooks.scm
+++ b/module/calp/util/hooks.scm
@@ -1,4 +1,4 @@
-(define-module (util hooks)
+(define-module (calp util hooks)
   :export (shutdown-hook))
 
 ;; Run before program terminates
diff --git a/module/util/io.scm b/module/calp/util/io.scm
index 50f01e12..7db1eee2 100644
--- a/module/util/io.scm
+++ b/module/calp/util/io.scm
@@ -1,4 +1,4 @@
-(define-module (util io)
+(define-module (calp util io)
   :use-module ((ice-9 rdelim) :select (read-line)))
 
 (define-public (open-input-port str)
@@ -52,7 +52,7 @@
         ;; thing.
         (delete-file tmpfile)
         (close-port port)
-        ;; `when' defaults to the truthy `()', see (util)
+        ;; `when' defaults to the truthy `()', see (calp util)
         ;; (note that #<unspecified> is thruthy, but shouldn't be
         ;; counted on, since anything with an unspecified return
         ;; value might as well return #f)
diff --git a/module/util/options.scm b/module/calp/util/options.scm
index a4c780bc..0e239a78 100644
--- a/module/util/options.scm
+++ b/module/calp/util/options.scm
@@ -1,5 +1,5 @@
-(define-module (util options)
-  :use-module (util)
+(define-module (calp util options)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
 )
 
diff --git a/module/util/time.scm b/module/calp/util/time.scm
index c97d3ee2..0a624d30 100644
--- a/module/util/time.scm
+++ b/module/calp/util/time.scm
@@ -1,4 +1,4 @@
-(define-module (util time)
+(define-module (calp util time)
   :use-module (ice-9 match)
   :export (report-time! profile!))
 
diff --git a/module/util/tree.scm b/module/calp/util/tree.scm
index 474dc272..b7856aa9 100644
--- a/module/util/tree.scm
+++ b/module/calp/util/tree.scm
@@ -1,6 +1,6 @@
-(define-module (util tree)
+(define-module (calp util tree)
   #:use-module (srfi srfi-1)
-  #:use-module (util)
+  #:use-module (calp util)
   #:export (make-tree left-subtree
                       right-subtree
                       length-of-longst-branch
diff --git a/module/datetime.scm b/module/datetime.scm
index 5a821afb..d004b2a5 100644
--- a/module/datetime.scm
+++ b/module/datetime.scm
@@ -9,13 +9,13 @@
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-9 gnu)
 
-  :use-module (util)
+  :use-module (calp util)
 
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
   :use-module (ice-9 i18n)
   :use-module (ice-9 format)
-  :use-module (util config)
+  :use-module (calp util config)
   :re-export (locale-month)
   )
 
diff --git a/module/datetime/instance.scm b/module/datetime/instance.scm
index 5b5a6604..6cce17f4 100644
--- a/module/datetime/instance.scm
+++ b/module/datetime/instance.scm
@@ -1,7 +1,7 @@
 (define-module (datetime instance)
-  :use-module (util)
-  :use-module (util config)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util config)
+  :use-module (calp util exceptions)
   :use-module (datetime zic)
   :use-module ((xdg basedir) :prefix xdg-)
   :export (zoneinfo))
diff --git a/module/datetime/timespec.scm b/module/datetime/timespec.scm
index ddd8a164..dd75ff7c 100644
--- a/module/datetime/timespec.scm
+++ b/module/datetime/timespec.scm
@@ -4,8 +4,8 @@
 ;;; Code:
 
 (define-module (datetime timespec)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (datetime)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/datetime/zic.scm b/module/datetime/zic.scm
index ac4b2f9b..080a8ad0 100644
--- a/module/datetime/zic.scm
+++ b/module/datetime/zic.scm
@@ -11,8 +11,8 @@
 ;; See zic(8) for data format
 ;;; Code:
 (define-module (datetime zic)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (datetime)
   :use-module (datetime timespec)
   :use-module (ice-9 rdelim)
diff --git a/module/srfi/srfi-41/util.scm b/module/srfi/srfi-41/util.scm
index eda379a7..aa28b852 100644
--- a/module/srfi/srfi-41/util.scm
+++ b/module/srfi/srfi-41/util.scm
@@ -2,7 +2,7 @@
   #:use-module (srfi srfi-1)
   #:use-module (srfi srfi-41)
   #:use-module ((ice-9 sandbox) :select (call-with-time-limit))
-  #:use-module (util) ; let*, find-min
+  #:use-module (calp util) ; let*, find-min
   #:export (stream-car+cdr interleave-streams with-streams
                            stream-timeslice-limit))
 
diff --git a/module/sxml/namespace.scm b/module/sxml/namespace.scm
index 5a274098..57250b93 100644
--- a/module/sxml/namespace.scm
+++ b/module/sxml/namespace.scm
@@ -1,5 +1,5 @@
 (define-module (sxml namespace)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (sxml transform))
 
 (define* (symbol-split symbol key: (sep #\:))
diff --git a/module/sxml/transformations.scm b/module/sxml/transformations.scm
index 037dc00f..5d82ee9c 100644
--- a/module/sxml/transformations.scm
+++ b/module/sxml/transformations.scm
@@ -6,7 +6,7 @@
 ;;; Code:
 
 (define-module (sxml transformations)
-  :use-module (util)
+  :use-module (calp util)
   :use-module ((srfi srfi-1) :select (concatenate))
   :use-module ((sxml transform) :select (pre-post-order))
   )
diff --git a/module/text/flow.scm b/module/text/flow.scm
index 75ef5ccf..b9f0e387 100644
--- a/module/text/flow.scm
+++ b/module/text/flow.scm
@@ -1,5 +1,5 @@
 (define-module (text flow)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (text util)
   :use-module (srfi srfi-1)
   )
diff --git a/module/text/markup.scm b/module/text/markup.scm
index 84bf7f61..7e625725 100644
--- a/module/text/markup.scm
+++ b/module/text/markup.scm
@@ -1,5 +1,5 @@
 (define-module (text markup)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (ice-9 match)
   :use-module (ice-9 pretty-print)
diff --git a/module/text/numbers.scm b/module/text/numbers.scm
index 3e302c69..883d7b2a 100644
--- a/module/text/numbers.scm
+++ b/module/text/numbers.scm
@@ -1,5 +1,5 @@
 (define-module (text numbers)
-  :use-module (util))
+  :use-module (calp util))
 
 ;; only used in number->string-cardinal
 (define (large-prefix e)
diff --git a/module/text/util.scm b/module/text/util.scm
index eda2df98..b2560bf4 100644
--- a/module/text/util.scm
+++ b/module/text/util.scm
@@ -1,5 +1,5 @@
 (define-module (text util)
-  :use-module (util))
+  :use-module (calp util))
 
 (define-public (words str) (string-split str #\space))
 (define-public (unwords list) (string-join list " " 'infix))
diff --git a/module/vcomponent.scm b/module/vcomponent.scm
index b4a30c83..a53523c0 100644
--- a/module/vcomponent.scm
+++ b/module/vcomponent.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent)
-  :use-module (util)
-  :use-module (util config)
+  :use-module (calp util)
+  :use-module (calp util config)
   :use-module (vcomponent base)
   :use-module (vcomponent parse)
   :use-module (vcomponent instance methods)
diff --git a/module/vcomponent/base.scm b/module/vcomponent/base.scm
index 47815a0e..ae10fe01 100644
--- a/module/vcomponent/base.scm
+++ b/module/vcomponent/base.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent base)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/vcomponent/build.scm b/module/vcomponent/build.scm
index a4512819..d49844cc 100644
--- a/module/vcomponent/build.scm
+++ b/module/vcomponent/build.scm
@@ -9,7 +9,7 @@
 ;;; Code:
 
 (define-module (vcomponent build)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent base)
   :use-module (srfi srfi-26)
   :use-module ((srfi srfi-88) :select (keyword->string)))
diff --git a/module/vcomponent/control.scm b/module/vcomponent/control.scm
index 6003c7ca..add48c28 100644
--- a/module/vcomponent/control.scm
+++ b/module/vcomponent/control.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent control)
-  #:use-module (util)
+  #:use-module (calp util)
   #:use-module (vcomponent)
   #:export (with-replaced-properties))
 
diff --git a/module/vcomponent/datetime.scm b/module/vcomponent/datetime.scm
index faeae70a..887ae48b 100644
--- a/module/vcomponent/datetime.scm
+++ b/module/vcomponent/datetime.scm
@@ -4,7 +4,7 @@
   #:use-module (datetime)
   #:use-module (datetime timespec)
   #:use-module (datetime zic)
-  #:use-module (util)
+  #:use-module (calp util)
 
   :use-module (ice-9 curried-definitions)
 
diff --git a/module/vcomponent/datetime/output.scm b/module/vcomponent/datetime/output.scm
index c76f010f..1b377a7c 100644
--- a/module/vcomponent/datetime/output.scm
+++ b/module/vcomponent/datetime/output.scm
@@ -1,7 +1,7 @@
 (define-module (vcomponent datetime output)
-  :use-module (util)
-  :use-module (util config)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util config)
+  :use-module (calp util exceptions)
   :use-module (datetime)
   :use-module (vcomponent base)
   :use-module (text util)
diff --git a/module/vcomponent/describe.scm b/module/vcomponent/describe.scm
index a579c245..063efa9c 100644
--- a/module/vcomponent/describe.scm
+++ b/module/vcomponent/describe.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent describe)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent base)
   :use-module (text util))
 
diff --git a/module/vcomponent/duration.scm b/module/vcomponent/duration.scm
index f8ef1d70..7591a880 100644
--- a/module/vcomponent/duration.scm
+++ b/module/vcomponent/duration.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent duration)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (datetime)
   :use-module (ice-9 peg)
   :use-module (ice-9 match)
diff --git a/module/vcomponent/geo.scm b/module/vcomponent/geo.scm
index 2a343ed9..ac370a6c 100644
--- a/module/vcomponent/geo.scm
+++ b/module/vcomponent/geo.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent geo)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-9 gnu))
 
 (define-immutable-record-type <geographical-position>
diff --git a/module/vcomponent/ical/output.scm b/module/vcomponent/ical/output.scm
index 75e579b8..a0816679 100644
--- a/module/vcomponent/ical/output.scm
+++ b/module/vcomponent/ical/output.scm
@@ -1,8 +1,8 @@
 (define-module (vcomponent ical output)
   :use-module (ice-9 format)
   :use-module (ice-9 match)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (vcomponent)
   :use-module (vcomponent datetime)
   :use-module (srfi srfi-1)
diff --git a/module/vcomponent/ical/parse.scm b/module/vcomponent/ical/parse.scm
index 96c18952..9c555bca 100644
--- a/module/vcomponent/ical/parse.scm
+++ b/module/vcomponent/ical/parse.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent ical parse)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module ((ice-9 rdelim) :select (read-line))
   :use-module (vcomponent base)
   :use-module (datetime)
diff --git a/module/vcomponent/ical/types.scm b/module/vcomponent/ical/types.scm
index b46bb236..1ec9d0bd 100644
--- a/module/vcomponent/ical/types.scm
+++ b/module/vcomponent/ical/types.scm
@@ -1,7 +1,7 @@
 ;; see (vcomponent parse types)
 (define-module (vcomponent ical types)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (base64)
   :use-module (datetime))
 
diff --git a/module/vcomponent/instance.scm b/module/vcomponent/instance.scm
index 88858709..206d7f19 100644
--- a/module/vcomponent/instance.scm
+++ b/module/vcomponent/instance.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent instance)
-  :use-module (util)
-  :use-module ((util config) :select (get-config))
+  :use-module (calp util)
+  :use-module ((calp util config) :select (get-config))
   :use-module ((oop goops) :select (make))
   :export (global-event-object)
 )
diff --git a/module/vcomponent/instance/methods.scm b/module/vcomponent/instance/methods.scm
index ea3522f9..7a193b8a 100644
--- a/module/vcomponent/instance/methods.scm
+++ b/module/vcomponent/instance/methods.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent instance methods)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-41)
   :use-module (srfi srfi-41 util)
diff --git a/module/vcomponent/parse.scm b/module/vcomponent/parse.scm
index 290a8d3e..9790d1eb 100644
--- a/module/vcomponent/parse.scm
+++ b/module/vcomponent/parse.scm
@@ -1,8 +1,8 @@
 (define-module (vcomponent parse)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent base)
   :use-module ((vcomponent vdir parse) :select (parse-vdir))
-  :use-module ((util time) :select (report-time!))
+  :use-module ((calp util time) :select (report-time!))
 
   :use-module (vcomponent ical parse)
   :re-export (parse-calendar)
diff --git a/module/vcomponent/parse/types.scm b/module/vcomponent/parse/types.scm
index c12da750..ba4b2b47 100644
--- a/module/vcomponent/parse/types.scm
+++ b/module/vcomponent/parse/types.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent parse types)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (base64)
   :use-module (datetime)
   :use-module (srfi srfi-9 gnu)
diff --git a/module/vcomponent/recurrence/display.scm b/module/vcomponent/recurrence/display.scm
index 1df95d0b..f9c6f1c4 100644
--- a/module/vcomponent/recurrence/display.scm
+++ b/module/vcomponent/recurrence/display.scm
@@ -6,7 +6,7 @@
 ;;; Code:
 
 (define-module (vcomponent recurrence display)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent recurrence internal)
   :use-module (text util)
   :use-module (text numbers)
diff --git a/module/vcomponent/recurrence/generate.scm b/module/vcomponent/recurrence/generate.scm
index 2d9d3960..c272e907 100644
--- a/module/vcomponent/recurrence/generate.scm
+++ b/module/vcomponent/recurrence/generate.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent recurrence generate)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-26)
   :use-module (srfi srfi-41)
diff --git a/module/vcomponent/recurrence/internal.scm b/module/vcomponent/recurrence/internal.scm
index 502f588f..0c119bb6 100644
--- a/module/vcomponent/recurrence/internal.scm
+++ b/module/vcomponent/recurrence/internal.scm
@@ -5,7 +5,7 @@
   #:use-module ((vcomponent base) :select (prop))
   #:use-module (srfi srfi-9)
   #:use-module (srfi srfi-9 gnu)
-  #:use-module (util)
+  #:use-module (calp util)
   )
 
 ;; EXDATE is also a property linked to recurense rules
diff --git a/module/vcomponent/recurrence/parse.scm b/module/vcomponent/recurrence/parse.scm
index 9019ae7e..b48e88e5 100644
--- a/module/vcomponent/recurrence/parse.scm
+++ b/module/vcomponent/recurrence/parse.scm
@@ -7,8 +7,8 @@
   #:use-module (datetime)
   #:use-module (srfi srfi-26)
   #:use-module (vcomponent recurrence internal)
-  #:use-module (util)
-  #:use-module (util exceptions)
+  #:use-module (calp util)
+  #:use-module (calp util exceptions)
   #:use-module (ice-9 match))
 
 
diff --git a/module/vcomponent/search.scm b/module/vcomponent/search.scm
index 15ff0720..7d039a24 100644
--- a/module/vcomponent/search.scm
+++ b/module/vcomponent/search.scm
@@ -25,7 +25,7 @@
 ;;; Code:
 
 (define-module (vcomponent search)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (srfi srfi-9)
   :use-module (srfi srfi-41)
diff --git a/module/vcomponent/vdir/parse.scm b/module/vcomponent/vdir/parse.scm
index e2fc37a1..d251e60a 100644
--- a/module/vcomponent/vdir/parse.scm
+++ b/module/vcomponent/vdir/parse.scm
@@ -11,8 +11,8 @@
   :use-module ((ice-9 rdelim) :select (read-line))
   :use-module ((ice-9 ftw) :select (scandir ftw))
 
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (vcomponent base)
 
   :use-module (vcomponent ical parse)
diff --git a/module/vcomponent/vdir/save-delete.scm b/module/vcomponent/vdir/save-delete.scm
index 2cbe96bf..d17b595e 100644
--- a/module/vcomponent/vdir/save-delete.scm
+++ b/module/vcomponent/vdir/save-delete.scm
@@ -10,11 +10,11 @@
 ;;; Code:
 
 (define-module (vcomponent vdir save-delete)
-  :use-module (util)
-  :use-module ((util exceptions) :select (assert)) 
+  :use-module (calp util)
+  :use-module ((calp util exceptions) :select (assert)) 
   :use-module (vcomponent ical output)
   :use-module (vcomponent)
-  :use-module ((util io) :select (with-atomic-output-to-file))
+  :use-module ((calp util io) :select (with-atomic-output-to-file))
   )
 
 
diff --git a/module/vcomponent/xcal/output.scm b/module/vcomponent/xcal/output.scm
index ec162ec0..692b3ec2 100644
--- a/module/vcomponent/xcal/output.scm
+++ b/module/vcomponent/xcal/output.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent xcal output)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (vcomponent)
   :use-module (vcomponent geo)
   :use-module (vcomponent xcal types)
diff --git a/module/vcomponent/xcal/parse.scm b/module/vcomponent/xcal/parse.scm
index a4b51b5b..26f25caa 100644
--- a/module/vcomponent/xcal/parse.scm
+++ b/module/vcomponent/xcal/parse.scm
@@ -1,6 +1,6 @@
 (define-module (vcomponent xcal parse)
-  :use-module (util)
-  :use-module (util exceptions)
+  :use-module (calp util)
+  :use-module (calp util exceptions)
   :use-module (base64)
   :use-module (ice-9 match)
   :use-module (sxml match)
diff --git a/module/vcomponent/xcal/types.scm b/module/vcomponent/xcal/types.scm
index 30916a35..468400f4 100644
--- a/module/vcomponent/xcal/types.scm
+++ b/module/vcomponent/xcal/types.scm
@@ -1,5 +1,5 @@
 (define-module (vcomponent xcal types)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (vcomponent ical types)
   :use-module (datetime)
   )
diff --git a/module/vulgar.scm b/module/vulgar.scm
index 722ccb51..eabd11f8 100644
--- a/module/vulgar.scm
+++ b/module/vulgar.scm
@@ -7,7 +7,7 @@
 (define-module (vulgar)
   #:use-module (srfi srfi-60)
   #:use-module (vulgar termios)
-  #:use-module (util)
+  #:use-module (calp util)
   #:export (with-vulgar))
 
 (define-public (cls)
diff --git a/module/vulgar/components.scm b/module/vulgar/components.scm
index 83c702b6..3909d63f 100644
--- a/module/vulgar/components.scm
+++ b/module/vulgar/components.scm
@@ -1,6 +1,6 @@
 (define-module (vulgar components)
   #:use-module (datetime)
-  #:use-module (util)
+  #:use-module (calp util)
   #:export ())
 
 (define-public (display-calendar-header! date)
diff --git a/module/vulgar/info.scm b/module/vulgar/info.scm
index 86abf0a0..66901ff8 100644
--- a/module/vulgar/info.scm
+++ b/module/vulgar/info.scm
@@ -1,5 +1,5 @@
 (define-module (vulgar info)
-  :use-module (util))
+  :use-module (calp util))
 
 (define-public (get-terminal-size)
  (let* (((rpipe . wpipe) (pipe)))
diff --git a/module/vulgar/termios.scm b/module/vulgar/termios.scm
index 2e260e21..75181ff3 100644
--- a/module/vulgar/termios.scm
+++ b/module/vulgar/termios.scm
@@ -7,7 +7,7 @@
   :use-module (ice-9 rdelim)
   :use-module (srfi srfi-9)             ; records
   :use-module (c cpp)
-  :use-module (util)
+  :use-module (calp util)
   :export (make-termios
            copy-termios
            tcsetattr! tcgetattr! cfmakeraw!))
diff --git a/module/web/http/make-routes.scm b/module/web/http/make-routes.scm
index c725513d..ab5f88a7 100644
--- a/module/web/http/make-routes.scm
+++ b/module/web/http/make-routes.scm
@@ -1,6 +1,6 @@
 (define-module (web http make-routes)
   :export (make-routes)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (ice-9 regex)
   :use-module (srfi srfi-1)
   :use-module (web response)
diff --git a/module/web/query.scm b/module/web/query.scm
index cb96824d..55b3f564 100644
--- a/module/web/query.scm
+++ b/module/web/query.scm
@@ -1,5 +1,5 @@
 (define-module (web query)
-  :use-module (util)
+  :use-module (calp util)
   :use-module (srfi srfi-1)
   :use-module (web uri))
 
diff --git a/scripts/benchmark.scm b/scripts/benchmark.scm
index f0e2cbcf..362ccccd 100644
--- a/scripts/benchmark.scm
+++ b/scripts/benchmark.scm
@@ -1,7 +1,7 @@
 (add-to-load-path "module")
-(use-modules (util)
-             (util app)
-             (util config)
+(use-modules (calp util)
+             (calp util app)
+             (calp util config)
              (vcomponent)
              (vcomponent group)
              (vcomponent datetime)
diff --git a/scripts/get-config.scm b/scripts/get-config.scm
index 6d9c3290..4ab2c2c9 100755
--- a/scripts/get-config.scm
+++ b/scripts/get-config.scm
@@ -11,7 +11,7 @@
 (add-to-load-path "module")
 
 (use-modules 
-  (util) 
+  (calp util) 
   (ice-9 ftw) 
   (ice-9 match)
   (srfi srfi-1)
diff --git a/system/config.scm b/system/config.scm
index fef7c9b5..6e765fcb 100644
--- a/system/config.scm
+++ b/system/config.scm
@@ -1,4 +1,4 @@
-(use-modules (util config)
+(use-modules (calp util config)
              (ice-9 regex)
              ((datetime) :select (mon))
              (glob))
diff --git a/tests/datetime.scm b/tests/datetime.scm
index 73b7ce65..83750472 100644
--- a/tests/datetime.scm
+++ b/tests/datetime.scm
@@ -10,7 +10,7 @@
   leap-year?
   )
  ((ice-9 format) format)
- ((util) let*)
+ ((calp util) let*)
  )
 
 (test-equal "empty time"
diff --git a/tests/let.scm b/tests/let.scm
index 14a246d2..82919b49 100644
--- a/tests/let.scm
+++ b/tests/let.scm
@@ -1,4 +1,4 @@
-(((util) let*)
+(((calp util) let*)
  ((guile) set!))
 
 (test-assert (let* ((a #t)) a))
diff --git a/tests/param.scm b/tests/param.scm
index ad690e61..0c4190dd 100644
--- a/tests/param.scm
+++ b/tests/param.scm
@@ -1,6 +1,6 @@
 (((vcomponent base) param prop* parameters)
  ((vcomponent parse) parse-calendar)
- ((util) sort*))
+ ((calp util) sort*))
 
 (define v (call-with-input-string
               "BEGIN:DUMMY
diff --git a/tests/recurrence.scm b/tests/recurrence.scm
index e73aa836..6ced6af0 100644
--- a/tests/recurrence.scm
+++ b/tests/recurrence.scm
@@ -12,7 +12,7 @@
  ((vcomponent base) make-vcomponent prop prop* extract)
  ((datetime) parse-ics-datetime datetime time date
   datetime->string)
- ((util) -> set!)
+ ((calp util) -> set!)
  ((srfi srfi-41) stream->list)
  ((srfi srfi-88) keyword->string))
 
diff --git a/tests/rrule-parse.scm b/tests/rrule-parse.scm
index f1d02d27..b7a851a0 100644
--- a/tests/rrule-parse.scm
+++ b/tests/rrule-parse.scm
@@ -2,7 +2,7 @@
   parse-recurrence-rule)
  ((vcomponent recurrence) make-recur-rule)
  ((datetime) mon)
- ((util exceptions) warnings-are-errors warning-handler)
+ ((calp util exceptions) warnings-are-errors warning-handler)
  )
 
 (test-equal (make-recur-rule freq: 'HOURLY wkst: mon interval: 1)
diff --git a/tests/run-tests.scm b/tests/run-tests.scm
index b162522d..670a1784 100755
--- a/tests/run-tests.scm
+++ b/tests/run-tests.scm
@@ -17,7 +17,7 @@
              (ice-9 getopt-long)
              (srfi srfi-64)             ; test suite
              (srfi srfi-88)             ; suffix keywords
-             ((util) :select (for awhen))
+             ((calp util) :select (for awhen))
              ;; datetime introduces the reader extensions for datetimes,
              ;; which leaks into the sandboxes below.
              (datetime))
diff --git a/tests/termios.scm b/tests/termios.scm
index 3fed5da3..214a12a0 100755
--- a/tests/termios.scm
+++ b/tests/termios.scm
@@ -7,7 +7,7 @@
 
 ;;; Code:
 
-(((util) set!)
+(((calp util) set!)
  ((vulgar termios)
   make-termios copy-termios
   lflag
diff --git a/tests/tz.scm b/tests/tz.scm
index 321bb960..8ccd636d 100644
--- a/tests/tz.scm
+++ b/tests/tz.scm
@@ -4,7 +4,7 @@
   datetime->unix-time
   unix-time->datetime
   get-datetime)
- ((util) let-env))
+ ((calp util) let-env))
 
 ;; London alternates between +0000 and +0100
 (let-env ((TZ "Europe/London"))
diff --git a/tests/util.scm b/tests/util.scm
index 6ad58a24..f917b5ce 100644
--- a/tests/util.scm
+++ b/tests/util.scm
@@ -1,4 +1,4 @@
-(((util) filter-sorted set/r!))
+(((calp util) filter-sorted set/r!))
 
 (test-equal "Filter sorted"
   '(3 4 5)
diff --git a/tests/web-server.scm b/tests/web-server.scm
index 49092607..6b315319 100644
--- a/tests/web-server.scm
+++ b/tests/web-server.scm
@@ -2,7 +2,7 @@
  ((web server) run-server)
  ((ice-9 threads) call-with-new-thread cancel-thread)
  ((web client) http-get)
- ((util) let*)
+ ((calp util) let*)
  ((web response) response-code response-location)
  ((web uri) build-uri uri-path)
  ((guile) AF_INET))
diff --git a/tests/xcal.scm b/tests/xcal.scm
index 0d4985df..1748cba3 100644
--- a/tests/xcal.scm
+++ b/tests/xcal.scm
@@ -1,7 +1,7 @@
 (((vcomponent xcal parse) sxcal->vcomponent)
  ((vcomponent xcal output) vcomponent->sxcal)
  ((vcomponent ical parse) parse-calendar)
- ((util) ->)
+ ((calp util) ->)
  ((vcomponent base)
   parameters prop* children)
  )