6 files changed, 8 insertions, 8 deletions
diff --git a/src/Language/SimpleShell/Parser.hs b/src/Language/SimpleShell/Parser/Common/Lexeme.hs
index 5f536ed..c0a6fd6 100644
--- a/src/Language/SimpleShell/Parser.hs
+++ b/src/Language/SimpleShell/Parser/Common/Lexeme.hs
@@ -1,7 +1,7 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE FlexibleContexts #-}
 
-module Language.SimpleShell.Parser
+module Language.SimpleShell.Parser.Common.Lexeme
   ( lexeme
   , symbol
   , commentFirstChars
diff --git a/src/Language/SimpleShell/Parser/Root.hs b/src/Language/SimpleShell/Parser/Common/Root.hs
index 9fa32ff..c0ec448 100644
--- a/src/Language/SimpleShell/Parser/Root.hs
+++ b/src/Language/SimpleShell/Parser/Common/Root.hs
@@ -1,4 +1,4 @@
-module Language.SimpleShell.Parser.Root
+module Language.SimpleShell.Parser.Common.Root
   ( RootParser
   )
 where
diff --git a/src/Language/SimpleShell/Parser/Expr.hs b/src/Language/SimpleShell/Parser/Expr.hs
index ab27555..dddc82a 100644
--- a/src/Language/SimpleShell/Parser/Expr.hs
+++ b/src/Language/SimpleShell/Parser/Expr.hs
@@ -14,13 +14,13 @@ where
 import Language.SimpleShell.AST.Expr (Expr(..), TypedExpr)
 import Language.SimpleShell.AST.Name (FunName, VarName)
 import Language.SimpleShell.AST.SimpleType (SimpleType(..), Typed, FunSig)
-import Language.SimpleShell.Parser
+import Language.SimpleShell.Parser.Common.Lexeme
   ( lexeme
   , symbol
   , commentFirstChars
   )
+import Language.SimpleShell.Parser.Common.Root (RootParser)
 import Language.SimpleShell.Parser.Name (nameP, keyword)
-import Language.SimpleShell.Parser.Root (RootParser)
 import Language.SimpleShell.Parser.SimpleType (forceType)
 import Control.Monad.Combinators.FailExpr
   ( Associativity(..)
diff --git a/src/Language/SimpleShell/Parser/Function.hs b/src/Language/SimpleShell/Parser/Function.hs
index 0753952..3565966 100644
--- a/src/Language/SimpleShell/Parser/Function.hs
+++ b/src/Language/SimpleShell/Parser/Function.hs
@@ -11,14 +11,14 @@ import Language.SimpleShell.AST.Expr (Expr)
 import Language.SimpleShell.AST.Function (Function(..))
 import Language.SimpleShell.AST.Name (FunName, VarName)
 import Language.SimpleShell.AST.SimpleType (SimpleType, FunSig, Typed)
-import Language.SimpleShell.Parser (symbol)
+import Language.SimpleShell.Parser.Common.Lexeme (symbol)
+import Language.SimpleShell.Parser.Common.Root (RootParser)
 import Language.SimpleShell.Parser.Expr
   ( runExprParser
   , strongTermP
   , strongTermP_
   )
 import Language.SimpleShell.Parser.Name (nameP, keyword)
-import Language.SimpleShell.Parser.Root (RootParser)
 import Language.SimpleShell.Parser.SimpleType (simpleTypeP, forceType)
 
 import Control.Applicative ((<|>))
diff --git a/src/Language/SimpleShell/Parser/Module.hs b/src/Language/SimpleShell/Parser/Module.hs
index 01a8975..a20ee7a 100644
--- a/src/Language/SimpleShell/Parser/Module.hs
+++ b/src/Language/SimpleShell/Parser/Module.hs
@@ -8,7 +8,7 @@ where
 import Language.SimpleShell.AST.Module (Module)
 import Language.SimpleShell.AST.Name (FunName, ProcedureName)
 import Language.SimpleShell.AST.SimpleType (FunSig, ProcedureSig)
-import Language.SimpleShell.Parser.Root (RootParser)
+import Language.SimpleShell.Parser.Common.Root (RootParser)
 
 import Control.Monad.Reader (ReaderT, runReaderT)
 import Control.Monad.State (StateT, execStateT)
diff --git a/src/Language/SimpleShell/Parser/Name.hs b/src/Language/SimpleShell/Parser/Name.hs
index 2691a36..235a9fb 100644
--- a/src/Language/SimpleShell/Parser/Name.hs
+++ b/src/Language/SimpleShell/Parser/Name.hs
@@ -7,7 +7,7 @@ module Language.SimpleShell.Parser.Name
 where
 
 
-import Language.SimpleShell.Parser (lexeme)
+import Language.SimpleShell.Parser.Common.Lexeme (lexeme)
 
 import Control.Monad (void)
 import Data.Text (Text, cons)