diff --git a/src/GF/Speech/Graph.hs b/src/GF/Data/Graph.hs
similarity index 99%
rename from src/GF/Speech/Graph.hs
rename to src/GF/Data/Graph.hs
index 1a0ebe0c0..bfb289860 100644
--- a/src/GF/Speech/Graph.hs
+++ b/src/GF/Data/Graph.hs
@@ -11,7 +11,7 @@
 --
 -- A simple graph module.
 -----------------------------------------------------------------------------
-module GF.Speech.Graph ( Graph(..), Node, Edge, NodeInfo
+module GF.Data.Graph ( Graph(..), Node, Edge, NodeInfo
                         , newGraph, nodes, edges
                         , nmap, emap, newNode, newNodes, newEdge, newEdges
                         , insertEdgeWith
diff --git a/src/GF/Speech/Graphviz.hs b/src/GF/Data/Graphviz.hs
similarity index 99%
rename from src/GF/Speech/Graphviz.hs
rename to src/GF/Data/Graphviz.hs
index 1851fcb64..411f76898 100644
--- a/src/GF/Speech/Graphviz.hs
+++ b/src/GF/Data/Graphviz.hs
@@ -12,7 +12,7 @@
 -- Graphviz DOT format representation and printing.
 -----------------------------------------------------------------------------
 
-module GF.Speech.Graphviz (
+module GF.Data.Graphviz (
 				  Graph(..), GraphType(..), 
 				  Node(..), Edge(..),
 				  Attr,
diff --git a/src/GF/Speech/Relation.hs b/src/GF/Data/Relation.hs
similarity index 99%
rename from src/GF/Speech/Relation.hs
rename to src/GF/Data/Relation.hs
index 641d671a9..1a052ec68 100644
--- a/src/GF/Speech/Relation.hs
+++ b/src/GF/Data/Relation.hs
@@ -12,7 +12,7 @@
 -- A simple module for relations.
 -----------------------------------------------------------------------------
 
-module GF.Speech.Relation (Rel, mkRel, mkRel'
+module GF.Data.Relation (Rel, mkRel, mkRel'
                            , allRelated , isRelatedTo
                            , transitiveClosure
                            , reflexiveClosure, reflexiveClosure_
diff --git a/src/GF/Speech/CFG.hs b/src/GF/Speech/CFG.hs
index 254024f5c..7f00d87ad 100644
--- a/src/GF/Speech/CFG.hs
+++ b/src/GF/Speech/CFG.hs
@@ -10,7 +10,7 @@ import GF.Data.Utilities
 import PGF.CId
 import GF.Infra.Option
 import GF.Infra.PrintClass
-import GF.Speech.Relation
+import GF.Data.Relation
 
 import Control.Monad
 import Control.Monad.State (State, get, put, evalState)
diff --git a/src/GF/Speech/CFGToFA.hs b/src/GF/Speech/CFGToFA.hs
index 1ac4bd24e..3045ac842 100644
--- a/src/GF/Speech/CFGToFA.hs
+++ b/src/GF/Speech/CFGToFA.hs
@@ -21,9 +21,9 @@ import GF.Speech.CFG
 import GF.Speech.PGFToCFG
 import GF.Infra.Ident (Ident)
 
+import GF.Data.Graph
+import GF.Data.Relation
 import GF.Speech.FiniteState
-import GF.Speech.Graph
-import GF.Speech.Relation
 import GF.Speech.CFG
 
 data Recursivity = RightR | LeftR | NotR
diff --git a/src/GF/Speech/FiniteState.hs b/src/GF/Speech/FiniteState.hs
index c809eb544..136d773a2 100644
--- a/src/GF/Speech/FiniteState.hs
+++ b/src/GF/Speech/FiniteState.hs
@@ -42,8 +42,8 @@ import Data.Set (Set)
 import qualified Data.Set as Set
 
 import GF.Data.Utilities
-import GF.Speech.Graph
-import qualified GF.Speech.Graphviz as Dot
+import GF.Data.Graph
+import qualified GF.Data.Graphviz as Dot
 
 type State = Int
 
diff --git a/src/GF/Speech/SLF.hs b/src/GF/Speech/SLF.hs
index 4bdc05212..84633149b 100644
--- a/src/GF/Speech/SLF.hs
+++ b/src/GF/Speech/SLF.hs
@@ -18,7 +18,7 @@ import GF.Speech.FiniteState
 import GF.Speech.CFG
 import GF.Speech.CFGToFA
 import GF.Speech.PGFToCFG
-import qualified GF.Speech.Graphviz as Dot
+import qualified GF.Data.Graphviz as Dot
 import PGF
 import PGF.CId
 
diff --git a/src/GF/Speech/SRG.hs b/src/GF/Speech/SRG.hs
index 03f6c0be7..1baa126f1 100644
--- a/src/GF/Speech/SRG.hs
+++ b/src/GF/Speech/SRG.hs
@@ -25,7 +25,7 @@ import GF.Infra.Option
 import GF.Infra.PrintClass
 import GF.Speech.CFG
 import GF.Speech.PGFToCFG
-import GF.Speech.Relation
+import GF.Data.Relation
 import GF.Speech.FiniteState
 import GF.Speech.RegExp
 import GF.Speech.CFGToFA