diff --git a/src/Gargantext/API/Ngrams.hs b/src/Gargantext/API/Ngrams.hs
index fca839ed3a7ead65962b5757b6f4ce2a1a2c98ca..087a0c7a8f03f12639f4d2e4996484aa17fc2128 100644
--- a/src/Gargantext/API/Ngrams.hs
+++ b/src/Gargantext/API/Ngrams.hs
@@ -57,7 +57,7 @@ import GHC.Generics (Generic)
 --import Gargantext.Core.Types.Main (Tree(..))
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Database.Types.Node (NodeType(..))
-import qualified Gargantext.Database.Ngrams as Ngrams
+import qualified Gargantext.Database.Schema.Ngrams as Ngrams
 import Gargantext.Prelude
 import Gargantext.Core.Types (ListType(..), ListId, CorpusId)
 import Prelude (Enum, Bounded, minBound, maxBound)
diff --git a/src/Gargantext/Database/Facet.hs b/src/Gargantext/Database/Facet.hs
index f3bac721304d2d80519182853b2e6e5b9a2cf6cf..252163a580ad106c726e41772e890ed70f051acc 100644
--- a/src/Gargantext/Database/Facet.hs
+++ b/src/Gargantext/Database/Facet.hs
@@ -44,7 +44,7 @@ import GHC.Generics (Generic)
 import Gargantext.Core.Types
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Database.Config (nodeTypeId)
-import Gargantext.Database.Ngrams
+import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Node
 import Gargantext.Database.NodeNgram
 import Gargantext.Database.NodeNode
diff --git a/src/Gargantext/Database/Flow.hs b/src/Gargantext/Database/Flow.hs
index 91fa5ccc1536621496fe2e17d822b45377334314..9788409801fb325d9e49f22129d99922363e4fac 100644
--- a/src/Gargantext/Database/Flow.hs
+++ b/src/Gargantext/Database/Flow.hs
@@ -27,7 +27,7 @@ import qualified Data.Map as DM
 import Gargantext.Core.Types (NodePoly(..), ListType(..), listTypeId)
 import Gargantext.Database.Bashql (runCmd') -- , del)
 import Gargantext.Database.Config (userMaster, userArbitrary, corpusMasterName)
-import Gargantext.Database.Ngrams (insertNgrams, Ngrams(..), NgramsT(..), NgramsIndexed(..), indexNgramsT,  NgramsType(..), text2ngrams)
+import Gargantext.Database.Schema.Ngrams (insertNgrams, Ngrams(..), NgramsT(..), NgramsIndexed(..), indexNgramsT,  NgramsType(..), text2ngrams)
 import Gargantext.Database.Node (mkRoot, mkCorpus, Cmd(..), mkList, mkGraph, mkDashboard, mkAnnuaire, getCorporaWithParentId')
 import Gargantext.Database.Root (getRootCmd)
 import Gargantext.Database.Types.Node (NodeType(..), NodeId)
diff --git a/src/Gargantext/Database/Flow/Pairing.hs b/src/Gargantext/Database/Flow/Pairing.hs
index f7b6ed12657dc250531dfde56793eed11ca8a00e..0c557d864e886124524ece6a7f8891ffeb743489 100644
--- a/src/Gargantext/Database/Flow/Pairing.hs
+++ b/src/Gargantext/Database/Flow/Pairing.hs
@@ -31,7 +31,7 @@ import qualified Data.Map as DM
 import Data.Text (Text, toLower)
 import qualified Data.Text as DT
 import Gargantext.Prelude hiding (sum)
-import Gargantext.Database.Ngrams -- (NgramsType(..))
+import Gargantext.Database.Schema.Ngrams -- (NgramsType(..))
 --import Gargantext.Database.Node.Contact -- (HyperdataContact(..))
 --import Gargantext.Database.Types.Node -- (Hyperdata(..))
 import Gargantext.Database.Node.Contact
diff --git a/src/Gargantext/Database/Flow/Utils.hs b/src/Gargantext/Database/Flow/Utils.hs
index 85bbd31d3c3514cb6ceb1f45e9814e2a6b9df66b..32e045f52ede929ae716c2616619faf4832f8689 100644
--- a/src/Gargantext/Database/Flow/Utils.hs
+++ b/src/Gargantext/Database/Flow/Utils.hs
@@ -18,7 +18,7 @@ module Gargantext.Database.Flow.Utils
 import Data.Map (Map)
 import qualified Data.Map as DM
 import Gargantext.Prelude
-import Gargantext.Database.Ngrams
+import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.Types.Node (NodeId, Node, NodePoly(..), Hyperdata)
 import Gargantext.Database.Node  -- (Cmd)
 import Gargantext.Database.NodeNgram
diff --git a/src/Gargantext/Database/Ngrams.hs b/src/Gargantext/Database/Schema/Ngrams.hs
similarity index 99%
rename from src/Gargantext/Database/Ngrams.hs
rename to src/Gargantext/Database/Schema/Ngrams.hs
index d5b4abbaffde071493d48fdb7d35bc9af9e28993..b2ad24c4fa3aaf15c484c4d318e7566b38935327 100644
--- a/src/Gargantext/Database/Ngrams.hs
+++ b/src/Gargantext/Database/Schema/Ngrams.hs
@@ -1,5 +1,5 @@
 {-|
-Module      : Gargantext.Database.Ngrams
+Module      : Gargantext.Database.Schema.Ngrams
 Description : Ngram connection to the Database
 Copyright   : (c) CNRS, 2017-Present
 License     : AGPL + CECILL v3
@@ -21,7 +21,7 @@ Ngrams connection to the Database.
 {-# LANGUAGE QuasiQuotes            #-}
 {-# LANGUAGE TemplateHaskell        #-}
 
-module Gargantext.Database.Ngrams where
+module Gargantext.Database.Schema.Ngrams where
 
 
 import Database.PostgreSQL.Simple as DPS (Connection)
diff --git a/src/Gargantext/Database/TextSearch.hs b/src/Gargantext/Database/TextSearch.hs
index 9359ebe73b24143ac98472e47e0b1526166e33bf..d277ff3b2de17d74b921ddb3ae78bdb65c66bc59 100644
--- a/src/Gargantext/Database/TextSearch.hs
+++ b/src/Gargantext/Database/TextSearch.hs
@@ -28,7 +28,7 @@ import Gargantext.Database.Types.Node (NodeType(..))
 import Gargantext.Prelude
 import Gargantext.Database.Facet
 import Gargantext.Database.Node
-import Gargantext.Database.Ngrams
+import Gargantext.Database.Schema.Ngrams
 import Gargantext.Database.NodeNode
 import Gargantext.Database.NodeNgram
 import Gargantext.Database.Queries
diff --git a/src/Gargantext/Viz/Phylo.hs b/src/Gargantext/Viz/Phylo.hs
index 69e8a24c314acf6300e3e272f012b51c4f012df8..86cef2f9a86992095854508d800acda397a50220 100644
--- a/src/Gargantext/Viz/Phylo.hs
+++ b/src/Gargantext/Viz/Phylo.hs
@@ -33,7 +33,7 @@ import Data.Maybe   (Maybe)
 import Data.Text    (Text)
 import Data.Time.Clock.POSIX  (POSIXTime)
 import GHC.Generics (Generic)
-import Gargantext.Database.Ngrams (NgramsId)
+import Gargantext.Database.Schema.Ngrams (NgramsId)
 import Gargantext.Core.Utils.Prefix (unPrefix)
 import Gargantext.Prelude