10 files changed, 57 insertions, 57 deletions
diff --git a/compiler/GHC/Runtime/Debugger.hs b/compiler/GHC/Runtime/Debugger.hs
index 5ad6a2c6f0..50622d8fa9 100644
--- a/compiler/GHC/Runtime/Debugger.hs
+++ b/compiler/GHC/Runtime/Debugger.hs
@@ -23,13 +23,13 @@ import GHC.Runtime.Interpreter
 import GHCi.RemoteTypes
 import GHC.Driver.Monad
 import GHC.Driver.Types
-import Id
+import GHC.Types.Id
 import GHC.Iface.Syntax ( showToHeader )
 import GHC.Iface.Env    ( newInteractiveBinder )
-import Name
-import Var hiding ( varName )
-import VarSet
-import UniqSet
+import GHC.Types.Name
+import GHC.Types.Var hiding ( varName )
+import GHC.Types.Var.Set
+import GHC.Types.Unique.Set
 import GHC.Core.Type
 import GHC
 import Outputable
diff --git a/compiler/GHC/Runtime/Eval.hs b/compiler/GHC/Runtime/Eval.hs
index 6ef575490f..794aa30b55 100644
--- a/compiler/GHC/Runtime/Eval.hs
+++ b/compiler/GHC/Runtime/Eval.hs
@@ -69,27 +69,27 @@ import TcType
 import Constraint
 import TcOrigin
 import GHC.Core.Predicate
-import Var
-import Id
-import Name             hiding ( varName )
-import NameSet
-import Avail
-import RdrName
-import VarEnv
+import GHC.Types.Var
+import GHC.Types.Id as Id
+import GHC.Types.Name      hiding ( varName )
+import GHC.Types.Name.Set
+import GHC.Types.Avail
+import GHC.Types.Name.Reader
+import GHC.Types.Var.Env
 import GHC.ByteCode.Types
 import GHC.Runtime.Linker as Linker
 import GHC.Driver.Session
 import GHC.LanguageExtensions
-import Unique
-import UniqSupply
+import GHC.Types.Unique
+import GHC.Types.Unique.Supply
 import MonadUtils
-import Module
+import GHC.Types.Module
 import PrelNames  ( toDynName, pretendNameIsInScope )
 import TysWiredIn ( isCTupleTyConName )
 import Panic
 import Maybes
 import ErrUtils
-import SrcLoc
+import GHC.Types.SrcLoc
 import GHC.Runtime.Heap.Inspect
 import Outputable
 import FastString
diff --git a/compiler/GHC/Runtime/Eval/Types.hs b/compiler/GHC/Runtime/Eval/Types.hs
index f1e3308f70..753f776f20 100644
--- a/compiler/GHC/Runtime/Eval/Types.hs
+++ b/compiler/GHC/Runtime/Eval/Types.hs
@@ -16,12 +16,12 @@ import GhcPrelude
 
 import GHCi.RemoteTypes
 import GHCi.Message (EvalExpr, ResumeContext)
-import Id
-import Name
-import Module
-import RdrName
+import GHC.Types.Id
+import GHC.Types.Name
+import GHC.Types.Module
+import GHC.Types.Name.Reader
 import GHC.Core.Type
-import SrcLoc
+import GHC.Types.SrcLoc
 import Exception
 
 import Data.Word
diff --git a/compiler/GHC/Runtime/Heap/Inspect.hs b/compiler/GHC/Runtime/Heap/Inspect.hs
index 37d9af0d8b..5f34e9d2d2 100644
--- a/compiler/GHC/Runtime/Heap/Inspect.hs
+++ b/compiler/GHC/Runtime/Heap/Inspect.hs
@@ -37,7 +37,7 @@ import GHC.Core.DataCon
 import GHC.Core.Type
 import GHC.Types.RepType
 import qualified GHC.Core.Unify as U
-import Var
+import GHC.Types.Var
 import TcRnMonad
 import TcType
 import TcMType
@@ -46,13 +46,13 @@ import TcUnify
 import TcEnv
 
 import GHC.Core.TyCon
-import Name
-import OccName
-import Module
+import GHC.Types.Name
+import GHC.Types.Name.Occurrence as OccName
+import GHC.Types.Module
 import GHC.Iface.Env
 import Util
-import VarSet
-import BasicTypes       ( Boxity(..) )
+import GHC.Types.Var.Set
+import GHC.Types.Basic ( Boxity(..) )
 import TysPrim
 import PrelNames
 import TysWiredIn
diff --git a/compiler/GHC/Runtime/Heap/Layout.hs b/compiler/GHC/Runtime/Heap/Layout.hs
index c6a159345d..c469f00cb4 100644
--- a/compiler/GHC/Runtime/Heap/Layout.hs
+++ b/compiler/GHC/Runtime/Heap/Layout.hs
@@ -46,7 +46,7 @@ module GHC.Runtime.Heap.Layout (
 
 import GhcPrelude
 
-import BasicTypes( ConTagZ )
+import GHC.Types.Basic( ConTagZ )
 import GHC.Driver.Session
 import Outputable
 import GHC.Platform
diff --git a/compiler/GHC/Runtime/Interpreter.hs b/compiler/GHC/Runtime/Interpreter.hs
index 82f0d5ffc4..61e5297184 100644
--- a/compiler/GHC/Runtime/Interpreter.hs
+++ b/compiler/GHC/Runtime/Interpreter.hs
@@ -62,20 +62,20 @@ import GHCi.ResolvedBCO
 import GHCi.BreakArray (BreakArray)
 import Fingerprint
 import GHC.Driver.Types
-import UniqFM
+import GHC.Types.Unique.FM
 import Panic
 import GHC.Driver.Session
 import Exception
-import BasicTypes
+import GHC.Types.Basic
 import FastString
 import Util
 import GHC.Runtime.Eval.Types(BreakInfo(..))
 import Outputable(brackets, ppr, showSDocUnqual)
-import SrcLoc
+import GHC.Types.SrcLoc
 import Maybes
-import Module
+import GHC.Types.Module
 import GHC.ByteCode.Types
-import Unique
+import GHC.Types.Unique
 
 #if defined(HAVE_INTERNAL_INTERPRETER)
 import GHCi.Run
diff --git a/compiler/GHC/Runtime/Interpreter/Types.hs b/compiler/GHC/Runtime/Interpreter/Types.hs
index 6cbf2620ee..9decf8abb2 100644
--- a/compiler/GHC/Runtime/Interpreter/Types.hs
+++ b/compiler/GHC/Runtime/Interpreter/Types.hs
@@ -14,7 +14,7 @@ import GhcPrelude
 
 import GHCi.RemoteTypes
 import GHCi.Message         ( Pipe )
-import UniqFM
+import GHC.Types.Unique.FM
 import Foreign
 
 import Control.Concurrent
diff --git a/compiler/GHC/Runtime/Linker.hs b/compiler/GHC/Runtime/Linker.hs
index c8b4b63a78..10f18a8525 100644
--- a/compiler/GHC/Runtime/Linker.hs
+++ b/compiler/GHC/Runtime/Linker.hs
@@ -44,20 +44,20 @@ import GHC.Driver.Phases
 import GHC.Driver.Finder
 import GHC.Driver.Types
 import GHC.Driver.Ways
-import Name
-import NameEnv
-import Module
+import GHC.Types.Name
+import GHC.Types.Name.Env
+import GHC.Types.Module
 import ListSetOps
 import GHC.Runtime.Linker.Types (DynLinker(..), LinkerUnitId, PersistentLinkerState(..))
 import GHC.Driver.Session
-import BasicTypes
+import GHC.Types.Basic
 import Outputable
 import Panic
 import Util
 import ErrUtils
-import SrcLoc
+import GHC.Types.SrcLoc
 import qualified Maybes
-import UniqDSet
+import GHC.Types.Unique.DSet
 import FastString
 import GHC.Platform
 import SysTools
diff --git a/compiler/GHC/Runtime/Linker/Types.hs b/compiler/GHC/Runtime/Linker/Types.hs
index 5b2f506c6d..d8530a1460 100644
--- a/compiler/GHC/Runtime/Linker/Types.hs
+++ b/compiler/GHC/Runtime/Linker/Types.hs
@@ -19,13 +19,13 @@ import GhcPrelude              ( FilePath, String, show )
 import Data.Time               ( UTCTime )
 import Data.Maybe              ( Maybe )
 import Control.Concurrent.MVar ( MVar )
-import Module                  ( InstalledUnitId, Module )
-import GHC.ByteCode.Types           ( ItblEnv, CompiledByteCode )
+import GHC.Types.Module        ( InstalledUnitId, Module )
+import GHC.ByteCode.Types      ( ItblEnv, CompiledByteCode )
 import Outputable
-import Var                     ( Id )
+import GHC.Types.Var           ( Id )
 import GHC.Fingerprint.Type    ( Fingerprint )
-import NameEnv                 ( NameEnv )
-import Name                    ( Name )
+import GHC.Types.Name.Env      ( NameEnv )
+import GHC.Types.Name          ( Name )
 import GHCi.RemoteTypes        ( ForeignHValue )
 
 type ClosureEnv = NameEnv (Name, ForeignHValue)
diff --git a/compiler/GHC/Runtime/Loader.hs b/compiler/GHC/Runtime/Loader.hs
index 44737c48ed..16c965701a 100644
--- a/compiler/GHC/Runtime/Loader.hs
+++ b/compiler/GHC/Runtime/Loader.hs
@@ -26,26 +26,26 @@ import GHC.Driver.Session
 import GHC.Runtime.Linker      ( linkModule, getHValue )
 import GHC.Runtime.Interpreter ( wormhole, withInterp )
 import GHC.Runtime.Interpreter.Types
-import SrcLoc           ( noSrcSpan )
-import GHC.Driver.Finder( findPluginModule, cannotFindModule )
-import TcRnMonad        ( initTcInteractive, initIfaceTcRn )
-import GHC.Iface.Load   ( loadPluginInterface )
-import RdrName          ( RdrName, ImportSpec(..), ImpDeclSpec(..)
-                        , ImpItemSpec(..), mkGlobalRdrEnv, lookupGRE_RdrName
-                        , gre_name, mkRdrQual )
-import OccName          ( OccName, mkVarOcc )
+import GHC.Types.SrcLoc        ( noSrcSpan )
+import GHC.Driver.Finder       ( findPluginModule, cannotFindModule )
+import TcRnMonad               ( initTcInteractive, initIfaceTcRn )
+import GHC.Iface.Load          ( loadPluginInterface )
+import GHC.Types.Name.Reader  ( RdrName, ImportSpec(..), ImpDeclSpec(..)
+                               , ImpItemSpec(..), mkGlobalRdrEnv, lookupGRE_RdrName
+                               , gre_name, mkRdrQual )
+import GHC.Types.Name.Occurrence ( OccName, mkVarOcc )
 import GHC.Rename.Names ( gresFromAvails )
 import GHC.Driver.Plugins
 import PrelNames        ( pluginTyConName, frontendPluginTyConName )
 
 import GHC.Driver.Types
-import GHCi.RemoteTypes ( HValue )
+import GHCi.RemoteTypes  ( HValue )
 import GHC.Core.Type     ( Type, eqType, mkTyConTy )
 import GHC.Core.TyCo.Ppr ( pprTyThingCategory )
 import GHC.Core.TyCon    ( TyCon )
-import Name             ( Name, nameModule_maybe )
-import Id               ( idType )
-import Module           ( Module, ModuleName )
+import GHC.Types.Name    ( Name, nameModule_maybe )
+import GHC.Types.Id      ( idType )
+import GHC.Types.Module  ( Module, ModuleName )
 import Panic
 import FastString
 import ErrUtils