diff --git a/bookhound-format.cabal b/bookhound-format.cabal
--- a/bookhound-format.cabal
+++ b/bookhound-format.cabal
@@ -1,11 +1,11 @@
 cabal-version: 1.12
 
--- This file has been generated from package.yaml by hpack version 0.34.4.
+-- This file has been generated from package.yaml by hpack version 0.35.0.
 --
 -- see: https://github.com/sol/hpack
 
 name:           bookhound-format
-version:        0.1.0.0
+version:        0.1.1.0
 synopsis:       Parsers for usual data formats
 description:    Please see the README on GitHub at <https://github.com/albertprz/bookhound-format#readme>
 category:       Parsers
@@ -76,7 +76,7 @@
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wpartial-fields -Wincomplete-uni-patterns -Wredundant-constraints
   build-depends:
       base >=4.7 && <5
-    , bookhound >=0.1.11.0
+    , bookhound >=0.1.13.0
     , containers >=0.6 && <1
     , text >=2.0 && <3
     , time >=1.9 && <2
diff --git a/src/Bookhound/Format/Operations/Finder.hs b/src/Bookhound/Format/Operations/Finder.hs
--- a/src/Bookhound/Format/Operations/Finder.hs
+++ b/src/Bookhound/Format/Operations/Finder.hs
@@ -7,7 +7,7 @@
 import Bookhound.Parsers.Number    (unsignedInt)
 import Bookhound.Parsers.String    (withinSquareBrackets)
 
-import Bookhound.Format.SyntaxTrees.Json  (JsExpression (..))
+import Bookhound.Format.SyntaxTrees.Json  (JsonExpression (..))
 import Bookhound.Format.SyntaxTrees.Toml  (TomlExpression (..))
 import Bookhound.Format.SyntaxTrees.Yaml  (YamlExpression (..))
 
@@ -48,7 +48,7 @@
 
 
 
-instance Finder JsExpression where
+instance Finder JsonExpression where
   toList = \case
     nil@JsNull       -> [("", nil)]
     n@(JsNumber _)   -> [("", n)]
diff --git a/src/Bookhound/Format/Operations/ToJson.hs b/src/Bookhound/Format/Operations/ToJson.hs
--- a/src/Bookhound/Format/Operations/ToJson.hs
+++ b/src/Bookhound/Format/Operations/ToJson.hs
@@ -5,7 +5,7 @@
 import Bookhound.Parsers.String    (spacing)
 
 import Bookhound.Format.Parsers.Json      (json)
-import Bookhound.Format.SyntaxTrees.Json  (JsExpression (..))
+import Bookhound.Format.SyntaxTrees.Json  (JsonExpression (..))
 import Bookhound.Format.SyntaxTrees.Toml  (TomlExpression (..))
 import Bookhound.Format.SyntaxTrees.Xml   (XmlExpression (..))
 import Bookhound.Format.SyntaxTrees.Yaml  (YamlExpression (..))
@@ -18,10 +18,10 @@
 
 
 class ToJson a where
-  toJson :: a -> JsExpression
+  toJson :: a -> JsonExpression
 
 
-instance {-# OVERLAPPABLE #-} ToJson JsExpression where
+instance {-# OVERLAPPABLE #-} ToJson JsonExpression where
   toJson = id
 
 instance ToJson XmlExpression where
diff --git a/src/Bookhound/Format/Operations/ToXml.hs b/src/Bookhound/Format/Operations/ToXml.hs
--- a/src/Bookhound/Format/Operations/ToXml.hs
+++ b/src/Bookhound/Format/Operations/ToXml.hs
@@ -3,7 +3,7 @@
 module Bookhound.Format.Operations.ToXml (ToXml(..)) where
 
 import Bookhound.Format.Operations.ToJson (ToJson (..))
-import Bookhound.Format.SyntaxTrees.Json  (JsExpression (..))
+import Bookhound.Format.SyntaxTrees.Json  (JsonExpression (..))
 import Bookhound.Format.SyntaxTrees.Xml   (XmlExpression (..), literalExpression)
 
 import           Data.Char (toLower)
@@ -21,7 +21,7 @@
   toXml = id
 
 
-instance ToXml JsExpression where
+instance ToXml JsonExpression where
 
   toXml = \case
     JsNull       -> literalExpression "null"
diff --git a/src/Bookhound/Format/Operations/ToYaml.hs b/src/Bookhound/Format/Operations/ToYaml.hs
--- a/src/Bookhound/Format/Operations/ToYaml.hs
+++ b/src/Bookhound/Format/Operations/ToYaml.hs
@@ -3,7 +3,7 @@
 module Bookhound.Format.Operations.ToYaml (ToYaml(..)) where
 
 import Bookhound.Format.Operations.ToJson (ToJson (..))
-import Bookhound.Format.SyntaxTrees.Json  (JsExpression (..))
+import Bookhound.Format.SyntaxTrees.Json  (JsonExpression (..))
 import Bookhound.Format.SyntaxTrees.Yaml  (CollectionType (..), YamlExpression (..))
 
 import Bookhound.Parser            (runParser)
@@ -22,7 +22,7 @@
 instance ToYaml YamlExpression where
   toYaml = id
 
-instance ToYaml JsExpression where
+instance ToYaml JsonExpression where
 
   toYaml = \case
     JsNull       -> YamlNull
diff --git a/src/Bookhound/Format/Parsers/Json.hs b/src/Bookhound/Format/Parsers/Json.hs
--- a/src/Bookhound/Format/Parsers/Json.hs
+++ b/src/Bookhound/Format/Parsers/Json.hs
@@ -7,52 +7,50 @@
 import Bookhound.Parsers.Number      (double)
 import Bookhound.Parsers.String      (spacing, withinDoubleQuotes)
 
-import Bookhound.Format.SyntaxTrees.Json    (JsExpression (..))
+import Bookhound.Format.SyntaxTrees.Json (JsonExpression (..))
 
 
-json :: Parser JsExpression
+json :: Parser JsonExpression
 json = maybeWithin spacing jsValue
   where
     jsValue = element <|> container
 
 
-nil :: Parser JsExpression
-nil = withError "Json Null"
-  $ JsNull <$ is "null"
+nil :: Parser JsonExpression
+nil = withError "Json Null" $
+  JsNull <$ is "null"
 
-number :: Parser JsExpression
-number = withError "Json Number"
-  $ JsNumber <$> double
+number :: Parser JsonExpression
+number = withError "Json Number" $
+  JsNumber <$> double
 
 
-bool :: Parser JsExpression
-bool = withError "Json Bool"
-  $ JsBool <$> (True  <$ is "true" <|>
-                False <$ is "false")
+bool :: Parser JsonExpression
+bool = withError "Json Bool" $
+  JsBool <$> (True  <$ is "true" <|>
+              False <$ is "false")
 
 
-string :: Parser JsExpression
-string = withError "Json String"
-  $ JsString <$> text
+string :: Parser JsonExpression
+string = withError "Json String" $
+  JsString <$> text
 
 
-array :: Parser JsExpression
-array = withError "Json Array"
-  $ JsArray <$> listOf json
+array :: Parser JsonExpression
+array = withError "Json Array" $
+  JsArray <$> listOf json
 
 
-object :: Parser JsExpression
-object = withError "Json Object"
-  $ JsObject <$> mapOf colon text json
-
+object :: Parser JsonExpression
+object = withError "Json Object" $
+  JsObject <$> mapOf colon text json
 
 
-element :: Parser JsExpression
+element :: Parser JsonExpression
 element = number <|> bool <|> nil <|> string
 
-container :: Parser JsExpression
+container :: Parser JsonExpression
 container = array <|> object
-
 
 
 text :: Parser String
diff --git a/src/Bookhound/Format/Parsers/Toml.hs b/src/Bookhound/Format/Parsers/Toml.hs
--- a/src/Bookhound/Format/Parsers/Toml.hs
+++ b/src/Bookhound/Format/Parsers/Toml.hs
@@ -3,7 +3,7 @@
 
 import Bookhound.Parser              (Parser, withError)
 import Bookhound.ParserCombinators   (IsMatch (..), maybeWithin, within, (<#>),
-                                      (<|>), (>>>), (|*), (|+), (|?))
+                                      (<|>), (->>-), (|*), (|+), (|?))
 import Bookhound.Parsers.Char        (dash, digit, dot, doubleQuote, equal,
                                       hashTag, letter, newLine, quote,
                                       spaceOrTab, underscore, whiteSpace)
@@ -80,7 +80,7 @@
 
 
 key :: Parser String
-key = keyParser >>> ((dot >>> keyParser) |*)
+key = keyParser ->>- ((dot ->>- keyParser) |*)
   where
     keyParser = maybeWithin spacesOrTabs $ freeText      <|>
                 withinDoubleQuotes (inverse doubleQuote |*) <|>
diff --git a/src/Bookhound/Format/Parsers/Xml.hs b/src/Bookhound/Format/Parsers/Xml.hs
--- a/src/Bookhound/Format/Parsers/Xml.hs
+++ b/src/Bookhound/Format/Parsers/Xml.hs
@@ -7,7 +7,7 @@
 import Bookhound.Parsers.String    (spacing, withinAngleBrackets,
                                     withinDoubleQuotes)
 
-import Bookhound.Format.SyntaxTrees.Xml   (XmlExpression (..), literalExpression)
+import Bookhound.Format.SyntaxTrees.Xml (XmlExpression (..), literalExpression)
 
 import           Data.Map (Map)
 import qualified Data.Map as Map
@@ -15,7 +15,7 @@
 
 xml :: Parser XmlExpression
 xml = maybeWithin  ((header <|> comment) |+)
-    $ maybeWithin spacing $ branchExpr <|> leafExpr
+    $ maybeWithin spacing (branchExpr <|> leafExpr)
 
 
 
diff --git a/src/Bookhound/Format/Parsers/Yaml.hs b/src/Bookhound/Format/Parsers/Yaml.hs
--- a/src/Bookhound/Format/Parsers/Yaml.hs
+++ b/src/Bookhound/Format/Parsers/Yaml.hs
@@ -5,7 +5,7 @@
 import Bookhound.Parser              (Parser, andThen, check, exactly,
                                       withError)
 import Bookhound.ParserCombinators   (IsMatch (..), maybeWithin, (<#>), (<|>),
-                                      (>>>), (|*), (|+), (|++), (|?))
+                                      (->>-), (|*), (|+), (|++), (|?))
 import Bookhound.Parsers.Char        (char, colon, dash, dot, doubleQuote,
                                       hashTag, newLine, question, quote, space,
                                       whiteSpace)
@@ -146,7 +146,7 @@
 
     quotedParser parser = mconcat <$> ((snd <$> foldingLineParser parser) |*)
 
-    plainTextParser styleParser = allowedStart >>> allowedString >>>
+    plainTextParser styleParser = allowedStart ->>- allowedString ->>-
                                   (indentationCheck (styleParser allowedString) indent |*)
 
     foldingLineParser parser = do sep <- ("\n" <$ newLine <* blankLines) <|> (" " <$ newLine)
@@ -174,7 +174,7 @@
 
 normalize :: Parser String
 normalize = withError "Normalize Yaml"
-  $ (parserActions >>> normalize) <|> (char |*)
+  $ (parserActions ->>- normalize) <|> (char |*)
   where
 
     parserActions = spreadDashes     <|>
diff --git a/src/Bookhound/Format/SyntaxTrees/Json.hs b/src/Bookhound/Format/SyntaxTrees/Json.hs
--- a/src/Bookhound/Format/SyntaxTrees/Json.hs
+++ b/src/Bookhound/Format/SyntaxTrees/Json.hs
@@ -1,24 +1,24 @@
-module Bookhound.Format.SyntaxTrees.Json (JsExpression(..)) where
+module Bookhound.Format.SyntaxTrees.Json (JsonExpression(..)) where
 
-import Bookhound.Internal.Foldable (stringify)
-import Bookhound.Internal.Map      (showMap)
+import Bookhound.Utils.Foldable (stringify)
+import Bookhound.Utils.Map      (showMap)
 
 import Data.Char (toLower)
 import Data.Map  (Map)
 
 
 
-data JsExpression
+data JsonExpression
   = JsNumber Double
   | JsBool Bool
   | JsString String
-  | JsArray [JsExpression]
-  | JsObject (Map String JsExpression)
+  | JsArray [JsonExpression]
+  | JsObject (Map String JsonExpression)
   | JsNull
   deriving (Eq, Ord)
 
 
-instance Show JsExpression where
+instance Show JsonExpression where
   show = \case
     JsNull       -> "null"
     JsNumber n   -> show n
diff --git a/src/Bookhound/Format/SyntaxTrees/Toml.hs b/src/Bookhound/Format/SyntaxTrees/Toml.hs
--- a/src/Bookhound/Format/SyntaxTrees/Toml.hs
+++ b/src/Bookhound/Format/SyntaxTrees/Toml.hs
@@ -1,8 +1,8 @@
 module Bookhound.Format.SyntaxTrees.Toml (TomlExpression(..), TableType(..)) where
 
-import Bookhound.Internal.DateTime (showDateTime)
-import Bookhound.Internal.Foldable (stringify)
-import Bookhound.Internal.Map      (showMap)
+import Bookhound.Utils.DateTime (showDateTime)
+import Bookhound.Utils.Foldable (stringify)
+import Bookhound.Utils.Map      (showMap)
 
 import Data.Char (toLower)
 import Data.Time (Day, TimeOfDay, ZonedTime (..))
diff --git a/src/Bookhound/Format/SyntaxTrees/Xml.hs b/src/Bookhound/Format/SyntaxTrees/Xml.hs
--- a/src/Bookhound/Format/SyntaxTrees/Xml.hs
+++ b/src/Bookhound/Format/SyntaxTrees/Xml.hs
@@ -1,6 +1,6 @@
 module Bookhound.Format.SyntaxTrees.Xml (XmlExpression(..), literalExpression, flatten, findAll, find) where
 
-import Bookhound.Internal.Foldable (stringify)
+import Bookhound.Utils.Foldable (stringify)
 
 import Data.Maybe (listToMaybe)
 
diff --git a/src/Bookhound/Format/SyntaxTrees/Yaml.hs b/src/Bookhound/Format/SyntaxTrees/Yaml.hs
--- a/src/Bookhound/Format/SyntaxTrees/Yaml.hs
+++ b/src/Bookhound/Format/SyntaxTrees/Yaml.hs
@@ -1,8 +1,8 @@
 module Bookhound.Format.SyntaxTrees.Yaml (YamlExpression(..), CollectionType(..)) where
 
-import Bookhound.Internal.DateTime ()
-import Bookhound.Internal.Foldable (stringify)
-import Bookhound.Internal.Map      (showMap)
+import Bookhound.Utils.DateTime ()
+import Bookhound.Utils.Foldable (stringify)
+import Bookhound.Utils.Map      (showMap)
 
 import           Data.Char (toLower)
 import           Data.Map  (Map)