Move files from src-ghc to src when they depend on Language.Haskell.L…

…iquid.*
ucsd-progsys · Sep 19, 2023 · 97dee59 · 97dee59
1 parent e442d73
commit 97dee59
Show file tree

Hide file tree

Showing 64 changed files with 113 additions and 114 deletions.
diff --git a/.hlint.yaml b/.hlint.yaml
@@ -1,16 +1,15 @@
 # To be compatible with GHC naming turn off the camelCase rule.
-- ignore: {name: "Use camelCase", within: [Liquid.GHC.Misc]} # 4 hints
+- ignore: {name: "Use camelCase", within: [Language.Haskell.Liquid.GHC.Misc]} # 4 hints
 # Linting LANGUAGE pragmas with complex CPP ifdefs is too hard.
 - ignore: {
     name: "Unused LANGUAGE pragma",
     within: [
       Liquid.GHC.API,
-      Liquid.GHC.Interface,
-      Liquid.GHC.GhcMonadLike,
-      Liquid.GHC.Misc
+      Language.Haskell.Liquid.GHC.Interface,
+      Language.Haskell.Liquid.GHC.Misc
     ]
   }
 # The following are kept for usability and style sake
 - ignore: {name: "Avoid lambda"} # 4 hints
 - ignore: {name: "Eta reduce"} # 51 hints
-- ignore: {name: "Use infix"} # 3 hints
+- ignore: {name: "Use infix"} # 3 hints
diff --git a/README.md b/README.md
@@ -353,7 +353,7 @@ using**.
 [GHC.API]:             liquidhaskell-boot/src-ghc/Liquid/GHC/API.hs
 [Plugin]:              liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs
 [GHC.Plugin]:          liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs
-[GHC.Interface]:       liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs
+[GHC.Interface]:       liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs
 [SpecFinder]:          liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/SpecFinder.hs
 [BareSpec]:            liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs#L362
 [LiftedSpec]:          liquidhaskell-boot/src/Language/Haskell/Liquid/Types/Specs.hs#L559
@@ -366,7 +366,7 @@ using**.
 [ghcide]:              https://github.com/haskell/ghcide
 [findRelevantSpecs]:   liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin/SpecFinder.hs#L65
 [core binds]:          https://hackage.haskell.org/package/ghc-9.2.5/docs/CoreSyn.html#t:CoreBind
-[configureGhcTargets]: liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs#L254
-[processTargetModule]: liquidhaskell-boot/src-ghc/Liquid/GHC/Interface.hs#L483
+[configureGhcTargets]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs#L254
+[processTargetModule]: liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Interface.hs#L483
 [processModule]:       liquidhaskell-boot/src/Language/Haskell/Liquid/GHC/Plugin.hs#L509
 
diff --git a/liquidhaskell-boot/liquidhaskell-boot.cabal b/liquidhaskell-boot/liquidhaskell-boot.cabal
@@ -65,14 +65,14 @@ library
                       Liquid.GHC.API
                       Liquid.GHC.API.Extra
                       Liquid.GHC.API.StableModule
-                      Liquid.GHC.Interface
-                      Liquid.GHC.Logging
-                      Liquid.GHC.Misc
-                      Liquid.GHC.Play
-                      Liquid.GHC.Resugar
-                      Liquid.GHC.SpanStack
-                      Liquid.GHC.Types
-                      Liquid.GHC.TypeRep
+                      Language.Haskell.Liquid.GHC.Interface
+                      Language.Haskell.Liquid.GHC.Logging
+                      Language.Haskell.Liquid.GHC.Misc
+                      Language.Haskell.Liquid.GHC.Play
+                      Language.Haskell.Liquid.GHC.Resugar
+                      Language.Haskell.Liquid.GHC.SpanStack
+                      Language.Haskell.Liquid.GHC.Types
+                      Language.Haskell.Liquid.GHC.TypeRep
                       Language.Haskell.Liquid.GHC.Plugin
                       Language.Haskell.Liquid.GHC.Plugin.Tutorial
                       Language.Haskell.Liquid.LawInstances

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare.hs
@@ -39,9 +39,9 @@ import           Language.Fixpoint.Misc                     as Misc
 import           Language.Fixpoint.Types                    hiding (dcFields, DataDecl, Error, panic)
 import qualified Language.Fixpoint.Types                    as F
 import qualified Language.Haskell.Liquid.Misc               as Misc -- (nubHashOn)
-import qualified Liquid.GHC.Misc           as GM
+import qualified Language.Haskell.Liquid.GHC.Misc           as GM
 import qualified Liquid.GHC.API            as Ghc
-import           Liquid.GHC.Types          (StableName)
+import           Language.Haskell.Liquid.GHC.Types          (StableName)
 import           Language.Haskell.Liquid.Types
 import           Language.Haskell.Liquid.WiredIn
 import qualified Language.Haskell.Liquid.Measure            as Ms

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Axiom.hs
@@ -24,10 +24,10 @@ import           Language.Fixpoint.Misc
 import qualified Language.Haskell.Liquid.Measure as Ms
 import qualified Language.Fixpoint.Types as F
 import qualified Liquid.GHC.API as Ghc
-import qualified Liquid.GHC.Misc as GM
+import qualified Language.Haskell.Liquid.GHC.Misc as GM
 import           Language.Haskell.Liquid.Types.RefType
 import           Language.Haskell.Liquid.Transforms.CoreToLogic
-import           Liquid.GHC.Misc
+import           Language.Haskell.Liquid.GHC.Misc
 import           Language.Haskell.Liquid.Types
 
 import           Language.Haskell.Liquid.Bare.Resolve as Bare

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Check.hs
@@ -32,8 +32,8 @@ import           Data.Hashable
 import qualified Language.Fixpoint.Misc                    as Misc
 import           Language.Fixpoint.SortCheck               (checkSorted, checkSortedReftFull, checkSortFull)
 import qualified Language.Fixpoint.Types                   as F
-import qualified Liquid.GHC.Misc          as GM
-import           Liquid.GHC.Play          (getNonPositivesTyCon)
+import qualified Language.Haskell.Liquid.GHC.Misc          as GM
+import           Language.Haskell.Liquid.GHC.Play          (getNonPositivesTyCon)
 import           Language.Haskell.Liquid.Misc              (condNull, thd5)
 import           Language.Haskell.Liquid.Types
 import           Language.Haskell.Liquid.WiredIn

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Class.hs
@@ -24,7 +24,7 @@ import qualified Language.Fixpoint.Types                    as F
 import qualified Language.Fixpoint.Types.Visitor            as F
 
 import           Language.Haskell.Liquid.Types.Dictionaries
-import qualified Liquid.GHC.Misc           as GM
+import qualified Language.Haskell.Liquid.GHC.Misc           as GM
 import qualified Liquid.GHC.API            as Ghc
 import           Language.Haskell.Liquid.Misc
 import           Language.Haskell.Liquid.Types.RefType

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/DataType.hs
@@ -28,7 +28,7 @@ import qualified Data.HashSet                           as S
 import qualified Data.Maybe                             as Mb
 
 import qualified Language.Fixpoint.Types                as F
-import qualified Liquid.GHC.Misc       as GM
+import qualified Language.Haskell.Liquid.GHC.Misc       as GM
 import qualified Liquid.GHC.API        as Ghc
 import           Language.Haskell.Liquid.Types.PredType (dataConPSpecType)
 import qualified Language.Haskell.Liquid.Types.RefType  as RT

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Elaborate.hs
@@ -26,7 +26,7 @@ where
 import qualified Language.Fixpoint.Types       as F
 -- import           Control.Arrow
 import           Liquid.GHC.API hiding (panic, varName)
-import qualified Liquid.GHC.Misc
+import qualified Language.Haskell.Liquid.GHC.Misc
                                                as GM
 import           Language.Haskell.Liquid.Types.Types
 import           Language.Haskell.Liquid.Types.RefType

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Expand.hs
@@ -40,7 +40,7 @@ import qualified Language.Fixpoint.Types               as F
 -- import qualified Language.Fixpoint.Types.Visitor       as F
 import qualified Language.Fixpoint.Misc                as Misc
 import           Language.Fixpoint.Types (Expr(..)) -- , Symbol, symbol)
-import qualified Liquid.GHC.Misc      as GM
+import qualified Language.Haskell.Liquid.GHC.Misc      as GM
 import qualified Liquid.GHC.API       as Ghc
 import qualified Language.Haskell.Liquid.Types.RefType as RT
 import           Language.Haskell.Liquid.Types         hiding (fresh)

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Laws.hs
@@ -7,7 +7,7 @@ import           Control.Monad ((<=<))
 
 import qualified Language.Haskell.Liquid.Measure            as Ms
 import qualified Language.Fixpoint.Types                    as F
-import qualified Liquid.GHC.Misc           as GM
+import qualified Language.Haskell.Liquid.GHC.Misc           as GM
 import           Language.Haskell.Liquid.Bare.Types         as Bare
 import           Language.Haskell.Liquid.Bare.Resolve       as Bare
 import           Language.Haskell.Liquid.Bare.Expand        as Bare

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Measure.hs
@@ -35,7 +35,7 @@ import qualified Language.Fixpoint.Misc                as Misc
 import qualified Language.Haskell.Liquid.Misc          as Misc
 import           Language.Haskell.Liquid.Misc             ((.||.))
 import qualified Liquid.GHC.API       as Ghc
-import qualified Liquid.GHC.Misc      as GM
+import qualified Language.Haskell.Liquid.GHC.Misc      as GM
 import qualified Language.Haskell.Liquid.Types.RefType as RT
 import           Language.Haskell.Liquid.Types
 -- import           Language.Haskell.Liquid.Types.Bounds

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Misc.hs
@@ -24,7 +24,7 @@ import qualified Data.Maybe                            as Mb --(fromMaybe, isNot
 import qualified Text.PrettyPrint.HughesPJ             as PJ
 import qualified Data.List                             as L
 import qualified Language.Fixpoint.Types as F
-import           Liquid.GHC.Misc
+import           Language.Haskell.Liquid.GHC.Misc
 import           Language.Haskell.Liquid.Types.RefType
 import           Language.Haskell.Liquid.Types.Types
 

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Plugged.hs
@@ -21,9 +21,9 @@ import qualified Data.Maybe                        as Mb
 import qualified Data.List                         as L
 import qualified Language.Fixpoint.Types           as F
 import qualified Language.Fixpoint.Types.Visitor   as F
-import qualified Liquid.GHC.Misc  as GM
+import qualified Language.Haskell.Liquid.GHC.Misc  as GM
 import qualified Liquid.GHC.API   as Ghc
-import           Liquid.GHC.Types (StableName, mkStableName)
+import           Language.Haskell.Liquid.GHC.Types (StableName, mkStableName)
 import           Language.Haskell.Liquid.Types.RefType ()
 import           Language.Haskell.Liquid.Types
 import qualified Language.Haskell.Liquid.Misc       as Misc

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Resolve.hs
@@ -67,7 +67,7 @@ import qualified Language.Fixpoint.Types               as F
 import qualified Language.Fixpoint.Types.Visitor       as F
 import qualified Language.Fixpoint.Misc                as Misc
 import qualified Liquid.GHC.API       as Ghc
-import qualified Liquid.GHC.Misc      as GM
+import qualified Language.Haskell.Liquid.GHC.Misc      as GM
 import qualified Language.Haskell.Liquid.Misc          as Misc
 import qualified Language.Haskell.Liquid.Types.RefType as RT
 import           Language.Haskell.Liquid.Types.Types

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/ToBare.hs
@@ -14,7 +14,7 @@ import           Data.Bifunctor
 
 import           Language.Fixpoint.Misc (mapSnd)
 import qualified Language.Fixpoint.Types as F
-import           Liquid.GHC.Misc
+import           Language.Haskell.Liquid.GHC.Misc
 import           Liquid.GHC.API
 import           Language.Haskell.Liquid.Types
 -- import           Language.Haskell.Liquid.Measure

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Typeclass.hs
@@ -22,7 +22,7 @@ import qualified Data.Maybe                    as Mb
 import qualified Language.Fixpoint.Types       as F
 import qualified Language.Fixpoint.Misc        as Misc
 import           Language.Haskell.Liquid.Bare.Elaborate
-import qualified Liquid.GHC.Misc
+import qualified Language.Haskell.Liquid.GHC.Misc
                                                as GM
 import qualified Liquid.GHC.API
                                                as Ghc

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Bare/Types.hs
@@ -37,7 +37,7 @@ import qualified Language.Haskell.Liquid.Types.RefType as RT
 import           Language.Haskell.Liquid.Types.Types
 import           Language.Haskell.Liquid.Types.Specs   hiding (BareSpec)
 import           Liquid.GHC.API       as Ghc hiding (Located, Env)
-import           Liquid.GHC.Types     (StableName)
+import           Language.Haskell.Liquid.GHC.Types     (StableName)
 
 
 type ModSpecs = M.HashMap ModName Ms.BareSpec

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Env.hs
@@ -68,7 +68,7 @@ import           Language.Fixpoint.SortCheck (pruneUnsortedReft)
 
 import           Liquid.GHC.API hiding (panic)
 import           Language.Haskell.Liquid.Types.RefType
-import qualified Liquid.GHC.SpanStack as Sp
+import qualified Language.Haskell.Liquid.GHC.SpanStack as Sp
 import           Language.Haskell.Liquid.Types            hiding (binds, Loc, loc, freeTyVars, Def)
 import           Language.Haskell.Liquid.Constraint.Types
 import           Language.Haskell.Liquid.Constraint.Fresh ()

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Fresh.hs
@@ -37,7 +37,7 @@ import           Language.Haskell.Liquid.Types
 -- import           Language.Haskell.Liquid.Types.RefType
 -- import           Language.Haskell.Liquid.Types.Fresh
 import           Language.Haskell.Liquid.Constraint.Types
-import qualified Liquid.GHC.Misc as GM
+import qualified Language.Haskell.Liquid.GHC.Misc as GM
 import           Liquid.GHC.API as Ghc
 
 --------------------------------------------------------------------------------

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Generate.hs
@@ -23,9 +23,9 @@ import           Liquid.GHC.API               as Ghc hiding ( panic
                                                             , text
                                                             , vcat
                                                             )
-import qualified Liquid.GHC.Resugar           as Rs
-import qualified Liquid.GHC.SpanStack         as Sp
-import qualified Liquid.GHC.Misc              as GM -- ( isInternal, collectArguments, tickSrcSpan, showPpr )
+import qualified Language.Haskell.Liquid.GHC.Resugar           as Rs
+import qualified Language.Haskell.Liquid.GHC.SpanStack         as Sp
+import qualified Language.Haskell.Liquid.GHC.Misc              as GM -- ( isInternal, collectArguments, tickSrcSpan, showPpr )
 import Text.PrettyPrint.HughesPJ ( text )
 import           Control.Monad.State
 import           Data.Maybe                                    (fromMaybe, isJust, mapMaybe)

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Init.hs
@@ -27,8 +27,8 @@ import qualified Language.Haskell.Liquid.UX.CTags              as Tg
 import           Language.Haskell.Liquid.Constraint.Fresh
 import           Language.Haskell.Liquid.Constraint.Env
 import           Language.Haskell.Liquid.WiredIn               (dictionaryVar)
-import qualified Liquid.GHC.SpanStack         as Sp
-import           Liquid.GHC.Misc             ( idDataConM, hasBaseTypeVar, isDataConId) -- dropModuleNames, simplesymbol)
+import qualified Language.Haskell.Liquid.GHC.SpanStack         as Sp
+import           Language.Haskell.Liquid.GHC.Misc             ( idDataConM, hasBaseTypeVar, isDataConId) -- dropModuleNames, simplesymbol)
 import           Liquid.GHC.API               as Ghc
 import           Language.Haskell.Liquid.Misc
 import           Language.Fixpoint.Misc

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Monad.hs
@@ -15,7 +15,7 @@ import           Language.Haskell.Liquid.Types hiding (loc)
 import           Language.Haskell.Liquid.Constraint.Types
 import           Language.Haskell.Liquid.Constraint.Env
 import           Language.Fixpoint.Misc hiding (errorstar)
-import           Liquid.GHC.Misc -- (concatMapM)
+import           Language.Haskell.Liquid.GHC.Misc -- (concatMapM)
 import           Liquid.GHC.API as Ghc hiding (panic, showPpr)
 
 --------------------------------------------------------------------------------

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Qualifier.hs
@@ -18,7 +18,7 @@ import           Language.Fixpoint.Types                  hiding (panic, mkQual)
 import qualified Language.Fixpoint.Types.Config as FC
 import           Language.Fixpoint.SortCheck
 import           Language.Haskell.Liquid.Types.RefType
-import           Liquid.GHC.Misc         (getSourcePos)
+import           Language.Haskell.Liquid.GHC.Misc         (getSourcePos)
 import           Language.Haskell.Liquid.Misc             (condNull)
 import           Language.Haskell.Liquid.Types.PredType
 import           Liquid.GHC.API hiding (Expr, mkQual, panic)

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Relational.hs
@@ -35,10 +35,10 @@ import           Liquid.GHC.API                 ( Alt
                                                 , TyVar
                                                 , Var(..))
 import qualified Liquid.GHC.API                as Ghc
-import qualified Liquid.GHC.Misc               as GM
-import           Liquid.GHC.Play               (Subable(sub, subTy))
-import qualified Liquid.GHC.SpanStack          as Sp
-import           Liquid.GHC.TypeRep            ()
+import qualified Language.Haskell.Liquid.GHC.Misc               as GM
+import           Language.Haskell.Liquid.GHC.Play               (Subable(sub, subTy))
+import qualified Language.Haskell.Liquid.GHC.SpanStack          as Sp
+import           Language.Haskell.Liquid.GHC.TypeRep            ()
 import           Language.Haskell.Liquid.Misc
 import           Language.Haskell.Liquid.Types                  hiding (Def,
                                                                  Loc, binds,

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Termination.hs
@@ -26,7 +26,7 @@ import           GHC.Types.Var (Var)
 import           GHC.Types.Name (NamedThing, getSrcSpan)
 import           GHC.Core.TyCon (TyCon)
 import           GHC.Core (Bind, CoreExpr, bindersOf)
-import qualified Liquid.GHC.Misc                    as GM
+import qualified Language.Haskell.Liquid.GHC.Misc                    as GM
 import qualified Language.Fixpoint.Types            as F
 import           Language.Fixpoint.Types.PrettyPrint (PPrint)
 import           Language.Haskell.Liquid.Constraint.Types (CG, CGInfo (..), CGEnv, makeRecInvariants)

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/ToFixpoint.hs
@@ -26,7 +26,7 @@ import qualified Data.Maybe as Mb
 -- imports for AxiomEnv
 import qualified Language.Haskell.Liquid.UX.Config as Config
 import           Language.Haskell.Liquid.UX.DiffCheck (coreDefs, coreDeps, dependsOn, Def(..))
-import qualified Liquid.GHC.Misc  as GM -- (simplesymbol)
+import qualified Language.Haskell.Liquid.GHC.Misc  as GM -- (simplesymbol)
 import qualified Data.List                         as L
 import qualified Data.HashMap.Strict               as M
 import qualified Data.HashSet                      as S

diff --git a/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs b/liquidhaskell-boot/src/Language/Haskell/Liquid/Constraint/Types.hs
@@ -63,7 +63,7 @@ import           Control.DeepSeq
 import           Data.Maybe               (isJust, mapMaybe)
 import           Control.Monad.State
 
-import           Liquid.GHC.SpanStack
+import           Language.Haskell.Liquid.GHC.SpanStack
 import           Liquid.GHC.API    as Ghc hiding ( (<+>)
                                                                   , vcat
                                                                   , parens

diff --git a/...kell-boot/src-ghc/Liquid/GHC/Interface.hs → .../Language/Haskell/Liquid/GHC/Interface.hs b/...kell-boot/src-ghc/Liquid/GHC/Interface.hs → .../Language/Haskell/Liquid/GHC/Interface.hs
@@ -14,7 +14,7 @@
 {-# OPTIONS_GHC -Wwarn=deprecations #-}
 {-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
-module Liquid.GHC.Interface (
+module Language.Haskell.Liquid.GHC.Interface (
 
   -- * Printer
     pprintCBs
@@ -76,9 +76,9 @@ import Text.Megaparsec.Error
 import Text.PrettyPrint.HughesPJ        hiding (first, (<>))
 import Language.Fixpoint.Types          hiding (err, panic, Error, Result, Expr)
 import qualified Language.Fixpoint.Misc as Misc
-import Liquid.GHC.Misc
-import Liquid.GHC.Types (MGIModGuts(..))
-import Liquid.GHC.Play
+import Language.Haskell.Liquid.GHC.Misc
+import Language.Haskell.Liquid.GHC.Types (MGIModGuts(..))
+import Language.Haskell.Liquid.GHC.Play
 import Language.Haskell.Liquid.WiredIn (isDerivedInstance)
 import qualified Language.Haskell.Liquid.Measure  as Ms
 import qualified Language.Haskell.Liquid.Misc     as Misc

diff --git a/...askell-boot/src-ghc/Liquid/GHC/Logging.hs → ...rc/Language/Haskell/Liquid/GHC/Logging.hs b/...askell-boot/src-ghc/Liquid/GHC/Logging.hs → ...rc/Language/Haskell/Liquid/GHC/Logging.hs
@@ -9,7 +9,7 @@
      to pay the price of a pretty-printing \"roundtrip\".
 -}
 
-module Liquid.GHC.Logging (
+module Language.Haskell.Liquid.GHC.Logging (
     fromPJDoc
   , putWarnMsg
   , mkLongErrAt

diff --git a/...idhaskell-boot/src-ghc/Liquid/GHC/Misc.hs → ...t/src/Language/Haskell/Liquid/GHC/Misc.hs b/...idhaskell-boot/src-ghc/Liquid/GHC/Misc.hs → ...t/src/Language/Haskell/Liquid/GHC/Misc.hs
@@ -18,7 +18,7 @@
 -- accessing GHC module information. It should NEVER depend on
 -- ANY module inside the Language.Haskell.Liquid.* tree.
 
-module Liquid.GHC.Misc where
+module  Language.Haskell.Liquid.GHC.Misc where
 
 import           Data.String
 import qualified Data.List as L

diff --git a/...idhaskell-boot/src-ghc/Liquid/GHC/Play.hs → ...t/src/Language/Haskell/Liquid/GHC/Play.hs b/...idhaskell-boot/src-ghc/Liquid/GHC/Play.hs → ...t/src/Language/Haskell/Liquid/GHC/Play.hs
@@ -3,7 +3,7 @@
 
 {-# OPTIONS_GHC -Wno-incomplete-patterns #-} -- TODO(#1918): Only needed for GHC <9.0.1.
 
-module Liquid.GHC.Play where
+module Language.Haskell.Liquid.GHC.Play where
 
 import Prelude hiding (error)
 
@@ -13,7 +13,7 @@ import qualified Data.List           as L
 import qualified Data.Maybe          as Mb
 
 import Liquid.GHC.API as Ghc hiding (substTysWith, panic,showPpr)
-import Liquid.GHC.Misc ()
+import Language.Haskell.Liquid.GHC.Misc ()
 import Language.Haskell.Liquid.Types.Errors
 import Language.Haskell.Liquid.Types.Variance