Cleanup modules.

Primarly this moves all vcompenent input and output code to clearly
labeled modules, instead of being spread out. At the same time it also
removes a handfull of unused procedures.

2 files changed, 8 insertions, 9 deletions

diff --git a/module/vcomponent/parse/types.scm b/module/vcomponent/formats/common/types.scm
index ba4b2b47..87425c01 100644
--- a/module/vcomponent/parse/types.scm
+++ b/module/vcomponent/formats/common/types.scm
@@ -1,9 +1,10 @@
-(define-module (vcomponent parse types)
+(define-module (vcomponent formats common types)
   :use-module (calp util)
   :use-module (calp util exceptions)
   :use-module (base64)
   :use-module (datetime)
   :use-module (srfi srfi-9 gnu)
+  :use-module (datetime timespec)
   )
 
 ;; BINARY
@@ -103,8 +104,6 @@
 (define (parse-uri props value)
   value)
 
-(use-modules (datetime timespec))
-
 ;; UTC-OFFSET
 (define (parse-utc-offset props value)
   (make-timespec
diff --git a/module/vcomponent/parse.scm b/module/vcomponent/util/parse-cal-path.scm
index 9790d1eb..94c0c6ed 100644
--- a/module/vcomponent/parse.scm
+++ b/module/vcomponent/util/parse-cal-path.scm
@@ -1,12 +1,12 @@
-(define-module (vcomponent parse)
+(define-module (vcomponent util parse-cal-path)
   :use-module (calp util)
-  :use-module (vcomponent base)
-  :use-module ((vcomponent vdir parse) :select (parse-vdir))
   :use-module ((calp util time) :select (report-time!))
+  :use-module (vcomponent base)
+  :use-module ((vcomponent formats ical parse)
+               :select (parse-calendar))
+  :use-module ((vcomponent formats vdir parse)
+               :select (parse-vdir)))
 
-  :use-module (vcomponent ical parse)
-  :re-export (parse-calendar)
-  )
 
 ;; Parse a vdir or ics file at the given path.
 (define-public (parse-cal-path path)