Merge pull request #6974 from phadej/Cabal-src

Move Cabal sources into Cabal/src
haskell · Jul 20, 2020 · 95c5e40 · 95c5e40
2 parents dce675f + 3cd9fde
commit 95c5e40
Show file tree

Hide file tree

Showing 248 changed files with 10 additions and 8 deletions.
diff --git a/Cabal/Cabal.cabal b/Cabal/Cabal.cabal
@@ -304,6 +304,9 @@ flag bundled-binary-generic
   default: False
 
 library
+  default-language: Haskell2010
+  hs-source-dirs: src
+
   build-depends:
     array      >= 0.4.0.1  && < 0.6,
     base       >= 4.6      && < 5,
@@ -612,7 +615,6 @@ library
       Distribution.Compat.Binary.Class
       Distribution.Compat.Binary.Generic
 
-  default-language: Haskell2010
   other-extensions:
     BangPatterns
     CPP

diff --git a/Cabal/Distribution/Backpack.hs → Cabal/src/Distribution/Backpack.hs b/Cabal/Distribution/Backpack.hs → Cabal/src/Distribution/Backpack.hs
diff --git a/.../Distribution/Backpack/ComponentsGraph.hs → .../Distribution/Backpack/ComponentsGraph.hs b/.../Distribution/Backpack/ComponentsGraph.hs → .../Distribution/Backpack/ComponentsGraph.hs
diff --git a/Cabal/Distribution/Backpack/Configure.hs → Cabal/src/Distribution/Backpack/Configure.hs b/Cabal/Distribution/Backpack/Configure.hs → Cabal/src/Distribution/Backpack/Configure.hs
diff --git a/...tribution/Backpack/ConfiguredComponent.hs → ...tribution/Backpack/ConfiguredComponent.hs b/...tribution/Backpack/ConfiguredComponent.hs → ...tribution/Backpack/ConfiguredComponent.hs
diff --git a/...l/Distribution/Backpack/DescribeUnitId.hs → ...c/Distribution/Backpack/DescribeUnitId.hs b/...l/Distribution/Backpack/DescribeUnitId.hs → ...c/Distribution/Backpack/DescribeUnitId.hs
diff --git a/Cabal/Distribution/Backpack/FullUnitId.hs → ...l/src/Distribution/Backpack/FullUnitId.hs b/Cabal/Distribution/Backpack/FullUnitId.hs → ...l/src/Distribution/Backpack/FullUnitId.hs
diff --git a/Cabal/Distribution/Backpack/Id.hs → Cabal/src/Distribution/Backpack/Id.hs b/Cabal/Distribution/Backpack/Id.hs → Cabal/src/Distribution/Backpack/Id.hs
diff --git a/.../Distribution/Backpack/LinkedComponent.hs → .../Distribution/Backpack/LinkedComponent.hs b/.../Distribution/Backpack/LinkedComponent.hs → .../Distribution/Backpack/LinkedComponent.hs
diff --git a/Cabal/Distribution/Backpack/MixLink.hs → Cabal/src/Distribution/Backpack/MixLink.hs b/Cabal/Distribution/Backpack/MixLink.hs → Cabal/src/Distribution/Backpack/MixLink.hs
diff --git a/Cabal/Distribution/Backpack/ModSubst.hs → Cabal/src/Distribution/Backpack/ModSubst.hs b/Cabal/Distribution/Backpack/ModSubst.hs → Cabal/src/Distribution/Backpack/ModSubst.hs
diff --git a/Cabal/Distribution/Backpack/ModuleScope.hs → .../src/Distribution/Backpack/ModuleScope.hs b/Cabal/Distribution/Backpack/ModuleScope.hs → .../src/Distribution/Backpack/ModuleScope.hs
diff --git a/Cabal/Distribution/Backpack/ModuleShape.hs → .../src/Distribution/Backpack/ModuleShape.hs b/Cabal/Distribution/Backpack/ModuleShape.hs → .../src/Distribution/Backpack/ModuleShape.hs
diff --git a/...ribution/Backpack/PreExistingComponent.hs → ...ribution/Backpack/PreExistingComponent.hs b/...ribution/Backpack/PreExistingComponent.hs → ...ribution/Backpack/PreExistingComponent.hs
diff --git a/...l/Distribution/Backpack/PreModuleShape.hs → ...c/Distribution/Backpack/PreModuleShape.hs b/...l/Distribution/Backpack/PreModuleShape.hs → ...c/Distribution/Backpack/PreModuleShape.hs
diff --git a/...l/Distribution/Backpack/ReadyComponent.hs → ...c/Distribution/Backpack/ReadyComponent.hs b/...l/Distribution/Backpack/ReadyComponent.hs → ...c/Distribution/Backpack/ReadyComponent.hs
diff --git a/Cabal/Distribution/Backpack/UnifyM.hs → Cabal/src/Distribution/Backpack/UnifyM.hs b/Cabal/Distribution/Backpack/UnifyM.hs → Cabal/src/Distribution/Backpack/UnifyM.hs
diff --git a/Cabal/Distribution/CabalSpecVersion.hs → Cabal/src/Distribution/CabalSpecVersion.hs b/Cabal/Distribution/CabalSpecVersion.hs → Cabal/src/Distribution/CabalSpecVersion.hs
diff --git a/Cabal/Distribution/Compat/Async.hs → Cabal/src/Distribution/Compat/Async.hs b/Cabal/Distribution/Compat/Async.hs → Cabal/src/Distribution/Compat/Async.hs
diff --git a/Cabal/Distribution/Compat/Binary.hs → Cabal/src/Distribution/Compat/Binary.hs b/Cabal/Distribution/Compat/Binary.hs → Cabal/src/Distribution/Compat/Binary.hs
diff --git a/Cabal/Distribution/Compat/Binary/Class.hs → ...l/src/Distribution/Compat/Binary/Class.hs b/Cabal/Distribution/Compat/Binary/Class.hs → ...l/src/Distribution/Compat/Binary/Class.hs
diff --git a/Cabal/Distribution/Compat/Binary/Generic.hs → ...src/Distribution/Compat/Binary/Generic.hs b/Cabal/Distribution/Compat/Binary/Generic.hs → ...src/Distribution/Compat/Binary/Generic.hs
diff --git a/Cabal/Distribution/Compat/CharParsing.hs → Cabal/src/Distribution/Compat/CharParsing.hs b/Cabal/Distribution/Compat/CharParsing.hs → Cabal/src/Distribution/Compat/CharParsing.hs
diff --git a/Cabal/Distribution/Compat/CopyFile.hs → Cabal/src/Distribution/Compat/CopyFile.hs b/Cabal/Distribution/Compat/CopyFile.hs → Cabal/src/Distribution/Compat/CopyFile.hs
diff --git a/Cabal/Distribution/Compat/CreatePipe.hs → Cabal/src/Distribution/Compat/CreatePipe.hs b/Cabal/Distribution/Compat/CreatePipe.hs → Cabal/src/Distribution/Compat/CreatePipe.hs
diff --git a/Cabal/Distribution/Compat/DList.hs → Cabal/src/Distribution/Compat/DList.hs b/Cabal/Distribution/Compat/DList.hs → Cabal/src/Distribution/Compat/DList.hs
diff --git a/Cabal/Distribution/Compat/Directory.hs → Cabal/src/Distribution/Compat/Directory.hs b/Cabal/Distribution/Compat/Directory.hs → Cabal/src/Distribution/Compat/Directory.hs
diff --git a/Cabal/Distribution/Compat/Environment.hs → Cabal/src/Distribution/Compat/Environment.hs b/Cabal/Distribution/Compat/Environment.hs → Cabal/src/Distribution/Compat/Environment.hs
diff --git a/Cabal/Distribution/Compat/Exception.hs → Cabal/src/Distribution/Compat/Exception.hs b/Cabal/Distribution/Compat/Exception.hs → Cabal/src/Distribution/Compat/Exception.hs
diff --git a/Cabal/Distribution/Compat/FilePath.hs → Cabal/src/Distribution/Compat/FilePath.hs b/Cabal/Distribution/Compat/FilePath.hs → Cabal/src/Distribution/Compat/FilePath.hs
diff --git a/...l/Distribution/Compat/GetShortPathName.hs → ...c/Distribution/Compat/GetShortPathName.hs b/...l/Distribution/Compat/GetShortPathName.hs → ...c/Distribution/Compat/GetShortPathName.hs
diff --git a/Cabal/Distribution/Compat/Graph.hs → Cabal/src/Distribution/Compat/Graph.hs b/Cabal/Distribution/Compat/Graph.hs → Cabal/src/Distribution/Compat/Graph.hs
diff --git a/.../Distribution/Compat/Internal/TempFile.hs → .../Distribution/Compat/Internal/TempFile.hs b/.../Distribution/Compat/Internal/TempFile.hs → .../Distribution/Compat/Internal/TempFile.hs
diff --git a/Cabal/Distribution/Compat/Lens.hs → Cabal/src/Distribution/Compat/Lens.hs b/Cabal/Distribution/Compat/Lens.hs → Cabal/src/Distribution/Compat/Lens.hs
diff --git a/Cabal/Distribution/Compat/MonadFail.hs → Cabal/src/Distribution/Compat/MonadFail.hs b/Cabal/Distribution/Compat/MonadFail.hs → Cabal/src/Distribution/Compat/MonadFail.hs
diff --git a/Cabal/Distribution/Compat/Newtype.hs → Cabal/src/Distribution/Compat/Newtype.hs b/Cabal/Distribution/Compat/Newtype.hs → Cabal/src/Distribution/Compat/Newtype.hs
diff --git a/Cabal/Distribution/Compat/NonEmptySet.hs → Cabal/src/Distribution/Compat/NonEmptySet.hs b/Cabal/Distribution/Compat/NonEmptySet.hs → Cabal/src/Distribution/Compat/NonEmptySet.hs
diff --git a/Cabal/Distribution/Compat/Parsing.hs → Cabal/src/Distribution/Compat/Parsing.hs b/Cabal/Distribution/Compat/Parsing.hs → Cabal/src/Distribution/Compat/Parsing.hs
diff --git a/Cabal/Distribution/Compat/Prelude.hs → Cabal/src/Distribution/Compat/Prelude.hs b/Cabal/Distribution/Compat/Prelude.hs → Cabal/src/Distribution/Compat/Prelude.hs
diff --git a/...l/Distribution/Compat/Prelude/Internal.hs → ...c/Distribution/Compat/Prelude/Internal.hs b/...l/Distribution/Compat/Prelude/Internal.hs → ...c/Distribution/Compat/Prelude/Internal.hs
diff --git a/Cabal/Distribution/Compat/Process.hs → Cabal/src/Distribution/Compat/Process.hs b/Cabal/Distribution/Compat/Process.hs → Cabal/src/Distribution/Compat/Process.hs
diff --git a/Cabal/Distribution/Compat/ResponseFile.hs → ...l/src/Distribution/Compat/ResponseFile.hs b/Cabal/Distribution/Compat/ResponseFile.hs → ...l/src/Distribution/Compat/ResponseFile.hs
diff --git a/Cabal/Distribution/Compat/Semigroup.hs → Cabal/src/Distribution/Compat/Semigroup.hs b/Cabal/Distribution/Compat/Semigroup.hs → Cabal/src/Distribution/Compat/Semigroup.hs
diff --git a/Cabal/Distribution/Compat/SnocList.hs → Cabal/src/Distribution/Compat/SnocList.hs b/Cabal/Distribution/Compat/SnocList.hs → Cabal/src/Distribution/Compat/SnocList.hs
diff --git a/Cabal/Distribution/Compat/Stack.hs → Cabal/src/Distribution/Compat/Stack.hs b/Cabal/Distribution/Compat/Stack.hs → Cabal/src/Distribution/Compat/Stack.hs
diff --git a/Cabal/Distribution/Compat/Time.hs → Cabal/src/Distribution/Compat/Time.hs b/Cabal/Distribution/Compat/Time.hs → Cabal/src/Distribution/Compat/Time.hs
diff --git a/Cabal/Distribution/Compat/Typeable.hs → Cabal/src/Distribution/Compat/Typeable.hs b/Cabal/Distribution/Compat/Typeable.hs → Cabal/src/Distribution/Compat/Typeable.hs
diff --git a/Cabal/Distribution/Compiler.hs → Cabal/src/Distribution/Compiler.hs b/Cabal/Distribution/Compiler.hs → Cabal/src/Distribution/Compiler.hs
diff --git a/Cabal/Distribution/FieldGrammar.hs → Cabal/src/Distribution/FieldGrammar.hs b/Cabal/Distribution/FieldGrammar.hs → Cabal/src/Distribution/FieldGrammar.hs
diff --git a/Cabal/Distribution/FieldGrammar/Class.hs → Cabal/src/Distribution/FieldGrammar/Class.hs b/Cabal/Distribution/FieldGrammar/Class.hs → Cabal/src/Distribution/FieldGrammar/Class.hs
diff --git a/.../Distribution/FieldGrammar/FieldDescrs.hs → .../Distribution/FieldGrammar/FieldDescrs.hs b/.../Distribution/FieldGrammar/FieldDescrs.hs → .../Distribution/FieldGrammar/FieldDescrs.hs
diff --git a/Cabal/Distribution/FieldGrammar/Newtypes.hs → ...src/Distribution/FieldGrammar/Newtypes.hs b/Cabal/Distribution/FieldGrammar/Newtypes.hs → ...src/Distribution/FieldGrammar/Newtypes.hs
diff --git a/Cabal/Distribution/FieldGrammar/Parsec.hs → ...l/src/Distribution/FieldGrammar/Parsec.hs b/Cabal/Distribution/FieldGrammar/Parsec.hs → ...l/src/Distribution/FieldGrammar/Parsec.hs
diff --git a/Cabal/Distribution/FieldGrammar/Pretty.hs → ...l/src/Distribution/FieldGrammar/Pretty.hs b/Cabal/Distribution/FieldGrammar/Pretty.hs → ...l/src/Distribution/FieldGrammar/Pretty.hs
diff --git a/Cabal/Distribution/Fields.hs → Cabal/src/Distribution/Fields.hs b/Cabal/Distribution/Fields.hs → Cabal/src/Distribution/Fields.hs
diff --git a/Cabal/Distribution/Fields/ConfVar.hs → Cabal/src/Distribution/Fields/ConfVar.hs b/Cabal/Distribution/Fields/ConfVar.hs → Cabal/src/Distribution/Fields/ConfVar.hs
diff --git a/Cabal/Distribution/Fields/Field.hs → Cabal/src/Distribution/Fields/Field.hs b/Cabal/Distribution/Fields/Field.hs → Cabal/src/Distribution/Fields/Field.hs
diff --git a/Cabal/Distribution/Fields/Lexer.hs → Cabal/src/Distribution/Fields/Lexer.hs b/Cabal/Distribution/Fields/Lexer.hs → Cabal/src/Distribution/Fields/Lexer.hs
diff --git a/Cabal/Distribution/Fields/LexerMonad.hs → Cabal/src/Distribution/Fields/LexerMonad.hs b/Cabal/Distribution/Fields/LexerMonad.hs → Cabal/src/Distribution/Fields/LexerMonad.hs
diff --git a/Cabal/Distribution/Fields/ParseResult.hs → Cabal/src/Distribution/Fields/ParseResult.hs b/Cabal/Distribution/Fields/ParseResult.hs → Cabal/src/Distribution/Fields/ParseResult.hs
diff --git a/Cabal/Distribution/Fields/Parser.hs → Cabal/src/Distribution/Fields/Parser.hs b/Cabal/Distribution/Fields/Parser.hs → Cabal/src/Distribution/Fields/Parser.hs
diff --git a/Cabal/Distribution/Fields/Pretty.hs → Cabal/src/Distribution/Fields/Pretty.hs b/Cabal/Distribution/Fields/Pretty.hs → Cabal/src/Distribution/Fields/Pretty.hs
diff --git a/Cabal/Distribution/GetOpt.hs → Cabal/src/Distribution/GetOpt.hs b/Cabal/Distribution/GetOpt.hs → Cabal/src/Distribution/GetOpt.hs
diff --git a/Cabal/Distribution/InstalledPackageInfo.hs → .../src/Distribution/InstalledPackageInfo.hs b/Cabal/Distribution/InstalledPackageInfo.hs → .../src/Distribution/InstalledPackageInfo.hs
diff --git a/Cabal/Distribution/Lex.hs → Cabal/src/Distribution/Lex.hs b/Cabal/Distribution/Lex.hs → Cabal/src/Distribution/Lex.hs
diff --git a/Cabal/Distribution/License.hs → Cabal/src/Distribution/License.hs b/Cabal/Distribution/License.hs → Cabal/src/Distribution/License.hs
diff --git a/Cabal/Distribution/Make.hs → Cabal/src/Distribution/Make.hs b/Cabal/Distribution/Make.hs → Cabal/src/Distribution/Make.hs
diff --git a/Cabal/Distribution/ModuleName.hs → Cabal/src/Distribution/ModuleName.hs b/Cabal/Distribution/ModuleName.hs → Cabal/src/Distribution/ModuleName.hs
diff --git a/Cabal/Distribution/Package.hs → Cabal/src/Distribution/Package.hs b/Cabal/Distribution/Package.hs → Cabal/src/Distribution/Package.hs
diff --git a/Cabal/Distribution/PackageDescription.hs → Cabal/src/Distribution/PackageDescription.hs b/Cabal/Distribution/PackageDescription.hs → Cabal/src/Distribution/PackageDescription.hs
diff --git a/.../Distribution/PackageDescription/Check.hs → .../Distribution/PackageDescription/Check.hs b/.../Distribution/PackageDescription/Check.hs → .../Distribution/PackageDescription/Check.hs
diff --git a/...ution/PackageDescription/Configuration.hs → ...ution/PackageDescription/Configuration.hs b/...ution/PackageDescription/Configuration.hs → ...ution/PackageDescription/Configuration.hs
diff --git a/...bution/PackageDescription/FieldGrammar.hs → ...bution/PackageDescription/FieldGrammar.hs b/...bution/PackageDescription/FieldGrammar.hs → ...bution/PackageDescription/FieldGrammar.hs
diff --git a/...Distribution/PackageDescription/Parsec.hs → ...Distribution/PackageDescription/Parsec.hs b/...Distribution/PackageDescription/Parsec.hs → ...Distribution/PackageDescription/Parsec.hs
diff --git a/...ibution/PackageDescription/PrettyPrint.hs → ...ibution/PackageDescription/PrettyPrint.hs b/...ibution/PackageDescription/PrettyPrint.hs → ...ibution/PackageDescription/PrettyPrint.hs
diff --git a/...Distribution/PackageDescription/Quirks.hs → ...Distribution/PackageDescription/Quirks.hs b/...Distribution/PackageDescription/Quirks.hs → ...Distribution/PackageDescription/Quirks.hs
diff --git a/.../Distribution/PackageDescription/Utils.hs → .../Distribution/PackageDescription/Utils.hs b/.../Distribution/PackageDescription/Utils.hs → .../Distribution/PackageDescription/Utils.hs
diff --git a/Cabal/Distribution/Parsec.hs → Cabal/src/Distribution/Parsec.hs b/Cabal/Distribution/Parsec.hs → Cabal/src/Distribution/Parsec.hs
diff --git a/Cabal/Distribution/Parsec/Error.hs → Cabal/src/Distribution/Parsec/Error.hs b/Cabal/Distribution/Parsec/Error.hs → Cabal/src/Distribution/Parsec/Error.hs
diff --git a/Cabal/Distribution/Parsec/FieldLineStream.hs → ...rc/Distribution/Parsec/FieldLineStream.hs b/Cabal/Distribution/Parsec/FieldLineStream.hs → ...rc/Distribution/Parsec/FieldLineStream.hs
diff --git a/Cabal/Distribution/Parsec/Position.hs → Cabal/src/Distribution/Parsec/Position.hs b/Cabal/Distribution/Parsec/Position.hs → Cabal/src/Distribution/Parsec/Position.hs
diff --git a/Cabal/Distribution/Parsec/Warning.hs → Cabal/src/Distribution/Parsec/Warning.hs b/Cabal/Distribution/Parsec/Warning.hs → Cabal/src/Distribution/Parsec/Warning.hs
diff --git a/Cabal/Distribution/Pretty.hs → Cabal/src/Distribution/Pretty.hs b/Cabal/Distribution/Pretty.hs → Cabal/src/Distribution/Pretty.hs
diff --git a/Cabal/Distribution/ReadE.hs → Cabal/src/Distribution/ReadE.hs b/Cabal/Distribution/ReadE.hs → Cabal/src/Distribution/ReadE.hs
diff --git a/Cabal/Distribution/SPDX.hs → Cabal/src/Distribution/SPDX.hs b/Cabal/Distribution/SPDX.hs → Cabal/src/Distribution/SPDX.hs
diff --git a/Cabal/Distribution/SPDX/License.hs → Cabal/src/Distribution/SPDX/License.hs b/Cabal/Distribution/SPDX/License.hs → Cabal/src/Distribution/SPDX/License.hs
diff --git a/...l/Distribution/SPDX/LicenseExceptionId.hs → ...c/Distribution/SPDX/LicenseExceptionId.hs b/...l/Distribution/SPDX/LicenseExceptionId.hs → ...c/Distribution/SPDX/LicenseExceptionId.hs
diff --git a/Cabal/Distribution/SPDX/LicenseExpression.hs → ...rc/Distribution/SPDX/LicenseExpression.hs b/Cabal/Distribution/SPDX/LicenseExpression.hs → ...rc/Distribution/SPDX/LicenseExpression.hs
diff --git a/Cabal/Distribution/SPDX/LicenseId.hs → Cabal/src/Distribution/SPDX/LicenseId.hs b/Cabal/Distribution/SPDX/LicenseId.hs → Cabal/src/Distribution/SPDX/LicenseId.hs
diff --git a/...l/Distribution/SPDX/LicenseListVersion.hs → ...c/Distribution/SPDX/LicenseListVersion.hs b/...l/Distribution/SPDX/LicenseListVersion.hs → ...c/Distribution/SPDX/LicenseListVersion.hs
diff --git a/Cabal/Distribution/SPDX/LicenseReference.hs → ...src/Distribution/SPDX/LicenseReference.hs b/Cabal/Distribution/SPDX/LicenseReference.hs → ...src/Distribution/SPDX/LicenseReference.hs
diff --git a/Cabal/Distribution/Simple.hs → Cabal/src/Distribution/Simple.hs b/Cabal/Distribution/Simple.hs → Cabal/src/Distribution/Simple.hs
diff --git a/Cabal/Distribution/Simple/Bench.hs → Cabal/src/Distribution/Simple/Bench.hs b/Cabal/Distribution/Simple/Bench.hs → Cabal/src/Distribution/Simple/Bench.hs
diff --git a/Cabal/Distribution/Simple/Build.hs → Cabal/src/Distribution/Simple/Build.hs b/Cabal/Distribution/Simple/Build.hs → Cabal/src/Distribution/Simple/Build.hs
diff --git a/Cabal/Distribution/Simple/Build/Macros.hs → ...l/src/Distribution/Simple/Build/Macros.hs b/Cabal/Distribution/Simple/Build/Macros.hs → ...l/src/Distribution/Simple/Build/Macros.hs
diff --git a/Cabal/Distribution/Simple/Build/Macros/Z.hs → ...src/Distribution/Simple/Build/Macros/Z.hs b/Cabal/Distribution/Simple/Build/Macros/Z.hs → ...src/Distribution/Simple/Build/Macros/Z.hs
diff --git a/.../Distribution/Simple/Build/PathsModule.hs → .../Distribution/Simple/Build/PathsModule.hs b/.../Distribution/Simple/Build/PathsModule.hs → .../Distribution/Simple/Build/PathsModule.hs
diff --git a/Cabal/Distribution/Simple/BuildPaths.hs → Cabal/src/Distribution/Simple/BuildPaths.hs b/Cabal/Distribution/Simple/BuildPaths.hs → Cabal/src/Distribution/Simple/BuildPaths.hs
diff --git a/Cabal/Distribution/Simple/BuildTarget.hs → Cabal/src/Distribution/Simple/BuildTarget.hs b/Cabal/Distribution/Simple/BuildTarget.hs → Cabal/src/Distribution/Simple/BuildTarget.hs
diff --git a/...l/Distribution/Simple/BuildToolDepends.hs → ...c/Distribution/Simple/BuildToolDepends.hs b/...l/Distribution/Simple/BuildToolDepends.hs → ...c/Distribution/Simple/BuildToolDepends.hs
diff --git a/Cabal/Distribution/Simple/CCompiler.hs → Cabal/src/Distribution/Simple/CCompiler.hs b/Cabal/Distribution/Simple/CCompiler.hs → Cabal/src/Distribution/Simple/CCompiler.hs
diff --git a/Cabal/Distribution/Simple/Command.hs → Cabal/src/Distribution/Simple/Command.hs b/Cabal/Distribution/Simple/Command.hs → Cabal/src/Distribution/Simple/Command.hs
diff --git a/Cabal/Distribution/Simple/Compiler.hs → Cabal/src/Distribution/Simple/Compiler.hs b/Cabal/Distribution/Simple/Compiler.hs → Cabal/src/Distribution/Simple/Compiler.hs
diff --git a/Cabal/Distribution/Simple/Configure.hs → Cabal/src/Distribution/Simple/Configure.hs b/Cabal/Distribution/Simple/Configure.hs → Cabal/src/Distribution/Simple/Configure.hs
diff --git a/Cabal/Distribution/Simple/Doctest.hs → Cabal/src/Distribution/Simple/Doctest.hs b/Cabal/Distribution/Simple/Doctest.hs → Cabal/src/Distribution/Simple/Doctest.hs
diff --git a/Cabal/Distribution/Simple/Flag.hs → Cabal/src/Distribution/Simple/Flag.hs b/Cabal/Distribution/Simple/Flag.hs → Cabal/src/Distribution/Simple/Flag.hs
diff --git a/Cabal/Distribution/Simple/GHC.hs → Cabal/src/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs → Cabal/src/Distribution/Simple/GHC.hs
diff --git a/...tribution/Simple/GHC/EnvironmentParser.hs → ...tribution/Simple/GHC/EnvironmentParser.hs b/...tribution/Simple/GHC/EnvironmentParser.hs → ...tribution/Simple/GHC/EnvironmentParser.hs
diff --git a/Cabal/Distribution/Simple/GHC/ImplInfo.hs → ...l/src/Distribution/Simple/GHC/ImplInfo.hs b/Cabal/Distribution/Simple/GHC/ImplInfo.hs → ...l/src/Distribution/Simple/GHC/ImplInfo.hs
diff --git a/Cabal/Distribution/Simple/GHC/Internal.hs → ...l/src/Distribution/Simple/GHC/Internal.hs b/Cabal/Distribution/Simple/GHC/Internal.hs → ...l/src/Distribution/Simple/GHC/Internal.hs
diff --git a/Cabal/Distribution/Simple/GHCJS.hs → Cabal/src/Distribution/Simple/GHCJS.hs b/Cabal/Distribution/Simple/GHCJS.hs → Cabal/src/Distribution/Simple/GHCJS.hs
diff --git a/Cabal/Distribution/Simple/Glob.hs → Cabal/src/Distribution/Simple/Glob.hs b/Cabal/Distribution/Simple/Glob.hs → Cabal/src/Distribution/Simple/Glob.hs
diff --git a/Cabal/Distribution/Simple/Haddock.hs → Cabal/src/Distribution/Simple/Haddock.hs b/Cabal/Distribution/Simple/Haddock.hs → Cabal/src/Distribution/Simple/Haddock.hs
diff --git a/Cabal/Distribution/Simple/HaskellSuite.hs → ...l/src/Distribution/Simple/HaskellSuite.hs b/Cabal/Distribution/Simple/HaskellSuite.hs → ...l/src/Distribution/Simple/HaskellSuite.hs
diff --git a/Cabal/Distribution/Simple/Hpc.hs → Cabal/src/Distribution/Simple/Hpc.hs b/Cabal/Distribution/Simple/Hpc.hs → Cabal/src/Distribution/Simple/Hpc.hs
diff --git a/Cabal/Distribution/Simple/Install.hs → Cabal/src/Distribution/Simple/Install.hs b/Cabal/Distribution/Simple/Install.hs → Cabal/src/Distribution/Simple/Install.hs
diff --git a/Cabal/Distribution/Simple/InstallDirs.hs → Cabal/src/Distribution/Simple/InstallDirs.hs b/Cabal/Distribution/Simple/InstallDirs.hs → Cabal/src/Distribution/Simple/InstallDirs.hs
diff --git a/...stribution/Simple/InstallDirs/Internal.hs → ...stribution/Simple/InstallDirs/Internal.hs b/...stribution/Simple/InstallDirs/Internal.hs → ...stribution/Simple/InstallDirs/Internal.hs
diff --git a/Cabal/Distribution/Simple/LocalBuildInfo.hs → ...src/Distribution/Simple/LocalBuildInfo.hs b/Cabal/Distribution/Simple/LocalBuildInfo.hs → ...src/Distribution/Simple/LocalBuildInfo.hs
diff --git a/Cabal/Distribution/Simple/PackageIndex.hs → ...l/src/Distribution/Simple/PackageIndex.hs b/Cabal/Distribution/Simple/PackageIndex.hs → ...l/src/Distribution/Simple/PackageIndex.hs
diff --git a/Cabal/Distribution/Simple/PreProcess.hs → Cabal/src/Distribution/Simple/PreProcess.hs b/Cabal/Distribution/Simple/PreProcess.hs → Cabal/src/Distribution/Simple/PreProcess.hs
diff --git a/...l/Distribution/Simple/PreProcess/Unlit.hs → ...c/Distribution/Simple/PreProcess/Unlit.hs b/...l/Distribution/Simple/PreProcess/Unlit.hs → ...c/Distribution/Simple/PreProcess/Unlit.hs
diff --git a/Cabal/Distribution/Simple/Program.hs → Cabal/src/Distribution/Simple/Program.hs b/Cabal/Distribution/Simple/Program.hs → Cabal/src/Distribution/Simple/Program.hs
diff --git a/Cabal/Distribution/Simple/Program/Ar.hs → Cabal/src/Distribution/Simple/Program/Ar.hs b/Cabal/Distribution/Simple/Program/Ar.hs → Cabal/src/Distribution/Simple/Program/Ar.hs
diff --git a/Cabal/Distribution/Simple/Program/Builtin.hs → ...rc/Distribution/Simple/Program/Builtin.hs b/Cabal/Distribution/Simple/Program/Builtin.hs → ...rc/Distribution/Simple/Program/Builtin.hs
diff --git a/Cabal/Distribution/Simple/Program/Db.hs → Cabal/src/Distribution/Simple/Program/Db.hs b/Cabal/Distribution/Simple/Program/Db.hs → Cabal/src/Distribution/Simple/Program/Db.hs
diff --git a/Cabal/Distribution/Simple/Program/Find.hs → ...l/src/Distribution/Simple/Program/Find.hs b/Cabal/Distribution/Simple/Program/Find.hs → ...l/src/Distribution/Simple/Program/Find.hs
diff --git a/Cabal/Distribution/Simple/Program/GHC.hs → Cabal/src/Distribution/Simple/Program/GHC.hs b/Cabal/Distribution/Simple/Program/GHC.hs → Cabal/src/Distribution/Simple/Program/GHC.hs
diff --git a/Cabal/Distribution/Simple/Program/HcPkg.hs → .../src/Distribution/Simple/Program/HcPkg.hs b/Cabal/Distribution/Simple/Program/HcPkg.hs → .../src/Distribution/Simple/Program/HcPkg.hs
diff --git a/Cabal/Distribution/Simple/Program/Hpc.hs → Cabal/src/Distribution/Simple/Program/Hpc.hs b/Cabal/Distribution/Simple/Program/Hpc.hs → Cabal/src/Distribution/Simple/Program/Hpc.hs
diff --git a/...l/Distribution/Simple/Program/Internal.hs → ...c/Distribution/Simple/Program/Internal.hs b/...l/Distribution/Simple/Program/Internal.hs → ...c/Distribution/Simple/Program/Internal.hs
diff --git a/Cabal/Distribution/Simple/Program/Ld.hs → Cabal/src/Distribution/Simple/Program/Ld.hs b/Cabal/Distribution/Simple/Program/Ld.hs → Cabal/src/Distribution/Simple/Program/Ld.hs
diff --git a/...stribution/Simple/Program/ResponseFile.hs → ...stribution/Simple/Program/ResponseFile.hs b/...stribution/Simple/Program/ResponseFile.hs → ...stribution/Simple/Program/ResponseFile.hs
diff --git a/Cabal/Distribution/Simple/Program/Run.hs → Cabal/src/Distribution/Simple/Program/Run.hs b/Cabal/Distribution/Simple/Program/Run.hs → Cabal/src/Distribution/Simple/Program/Run.hs
diff --git a/Cabal/Distribution/Simple/Program/Script.hs → ...src/Distribution/Simple/Program/Script.hs b/Cabal/Distribution/Simple/Program/Script.hs → ...src/Distribution/Simple/Program/Script.hs
diff --git a/Cabal/Distribution/Simple/Program/Strip.hs → .../src/Distribution/Simple/Program/Strip.hs b/Cabal/Distribution/Simple/Program/Strip.hs → .../src/Distribution/Simple/Program/Strip.hs
diff --git a/Cabal/Distribution/Simple/Program/Types.hs → .../src/Distribution/Simple/Program/Types.hs b/Cabal/Distribution/Simple/Program/Types.hs → .../src/Distribution/Simple/Program/Types.hs
diff --git a/Cabal/Distribution/Simple/Register.hs → Cabal/src/Distribution/Simple/Register.hs b/Cabal/Distribution/Simple/Register.hs → Cabal/src/Distribution/Simple/Register.hs
diff --git a/Cabal/Distribution/Simple/Setup.hs → Cabal/src/Distribution/Simple/Setup.hs b/Cabal/Distribution/Simple/Setup.hs → Cabal/src/Distribution/Simple/Setup.hs
diff --git a/Cabal/Distribution/Simple/ShowBuildInfo.hs → .../src/Distribution/Simple/ShowBuildInfo.hs b/Cabal/Distribution/Simple/ShowBuildInfo.hs → .../src/Distribution/Simple/ShowBuildInfo.hs
diff --git a/Cabal/Distribution/Simple/SrcDist.hs → Cabal/src/Distribution/Simple/SrcDist.hs b/Cabal/Distribution/Simple/SrcDist.hs → Cabal/src/Distribution/Simple/SrcDist.hs
diff --git a/Cabal/Distribution/Simple/Test.hs → Cabal/src/Distribution/Simple/Test.hs b/Cabal/Distribution/Simple/Test.hs → Cabal/src/Distribution/Simple/Test.hs
diff --git a/Cabal/Distribution/Simple/Test/ExeV10.hs → Cabal/src/Distribution/Simple/Test/ExeV10.hs b/Cabal/Distribution/Simple/Test/ExeV10.hs → Cabal/src/Distribution/Simple/Test/ExeV10.hs
diff --git a/Cabal/Distribution/Simple/Test/LibV09.hs → Cabal/src/Distribution/Simple/Test/LibV09.hs b/Cabal/Distribution/Simple/Test/LibV09.hs → Cabal/src/Distribution/Simple/Test/LibV09.hs
diff --git a/Cabal/Distribution/Simple/Test/Log.hs → Cabal/src/Distribution/Simple/Test/Log.hs b/Cabal/Distribution/Simple/Test/Log.hs → Cabal/src/Distribution/Simple/Test/Log.hs
diff --git a/Cabal/Distribution/Simple/UHC.hs → Cabal/src/Distribution/Simple/UHC.hs b/Cabal/Distribution/Simple/UHC.hs → Cabal/src/Distribution/Simple/UHC.hs
diff --git a/Cabal/Distribution/Simple/UserHooks.hs → Cabal/src/Distribution/Simple/UserHooks.hs b/Cabal/Distribution/Simple/UserHooks.hs → Cabal/src/Distribution/Simple/UserHooks.hs
diff --git a/Cabal/Distribution/Simple/Utils.hs → Cabal/src/Distribution/Simple/Utils.hs b/Cabal/Distribution/Simple/Utils.hs → Cabal/src/Distribution/Simple/Utils.hs
diff --git a/Cabal/Distribution/Simple/Utils/Json.hs → Cabal/src/Distribution/Simple/Utils/Json.hs b/Cabal/Distribution/Simple/Utils/Json.hs → Cabal/src/Distribution/Simple/Utils/Json.hs
diff --git a/Cabal/Distribution/System.hs → Cabal/src/Distribution/System.hs b/Cabal/Distribution/System.hs → Cabal/src/Distribution/System.hs
diff --git a/Cabal/Distribution/TestSuite.hs → Cabal/src/Distribution/TestSuite.hs b/Cabal/Distribution/TestSuite.hs → Cabal/src/Distribution/TestSuite.hs
diff --git a/Cabal/Distribution/Text.hs → Cabal/src/Distribution/Text.hs b/Cabal/Distribution/Text.hs → Cabal/src/Distribution/Text.hs
diff --git a/Cabal/Distribution/Types/AbiDependency.hs → ...l/src/Distribution/Types/AbiDependency.hs b/Cabal/Distribution/Types/AbiDependency.hs → ...l/src/Distribution/Types/AbiDependency.hs
diff --git a/Cabal/Distribution/Types/AbiHash.hs → Cabal/src/Distribution/Types/AbiHash.hs b/Cabal/Distribution/Types/AbiHash.hs → Cabal/src/Distribution/Types/AbiHash.hs
diff --git a/Cabal/Distribution/Types/AnnotatedId.hs → Cabal/src/Distribution/Types/AnnotatedId.hs b/Cabal/Distribution/Types/AnnotatedId.hs → Cabal/src/Distribution/Types/AnnotatedId.hs
diff --git a/Cabal/Distribution/Types/Benchmark.hs → Cabal/src/Distribution/Types/Benchmark.hs b/Cabal/Distribution/Types/Benchmark.hs → Cabal/src/Distribution/Types/Benchmark.hs
diff --git a/Cabal/Distribution/Types/Benchmark/Lens.hs → .../src/Distribution/Types/Benchmark/Lens.hs b/Cabal/Distribution/Types/Benchmark/Lens.hs → .../src/Distribution/Types/Benchmark/Lens.hs
diff --git a/.../Distribution/Types/BenchmarkInterface.hs → .../Distribution/Types/BenchmarkInterface.hs b/.../Distribution/Types/BenchmarkInterface.hs → .../Distribution/Types/BenchmarkInterface.hs
diff --git a/Cabal/Distribution/Types/BenchmarkType.hs → ...l/src/Distribution/Types/BenchmarkType.hs b/Cabal/Distribution/Types/BenchmarkType.hs → ...l/src/Distribution/Types/BenchmarkType.hs
diff --git a/Cabal/Distribution/Types/BuildInfo.hs → Cabal/src/Distribution/Types/BuildInfo.hs b/Cabal/Distribution/Types/BuildInfo.hs → Cabal/src/Distribution/Types/BuildInfo.hs
diff --git a/Cabal/Distribution/Types/BuildInfo/Lens.hs → .../src/Distribution/Types/BuildInfo/Lens.hs b/Cabal/Distribution/Types/BuildInfo/Lens.hs → .../src/Distribution/Types/BuildInfo/Lens.hs
diff --git a/Cabal/Distribution/Types/BuildType.hs → Cabal/src/Distribution/Types/BuildType.hs b/Cabal/Distribution/Types/BuildType.hs → Cabal/src/Distribution/Types/BuildType.hs
diff --git a/Cabal/Distribution/Types/Component.hs → Cabal/src/Distribution/Types/Component.hs b/Cabal/Distribution/Types/Component.hs → Cabal/src/Distribution/Types/Component.hs
diff --git a/Cabal/Distribution/Types/ComponentId.hs → Cabal/src/Distribution/Types/ComponentId.hs b/Cabal/Distribution/Types/ComponentId.hs → Cabal/src/Distribution/Types/ComponentId.hs
diff --git a/Cabal/Distribution/Types/ComponentInclude.hs → ...rc/Distribution/Types/ComponentInclude.hs b/Cabal/Distribution/Types/ComponentInclude.hs → ...rc/Distribution/Types/ComponentInclude.hs
diff --git a/...ribution/Types/ComponentLocalBuildInfo.hs → ...ribution/Types/ComponentLocalBuildInfo.hs b/...ribution/Types/ComponentLocalBuildInfo.hs → ...ribution/Types/ComponentLocalBuildInfo.hs
diff --git a/Cabal/Distribution/Types/ComponentName.hs → ...l/src/Distribution/Types/ComponentName.hs b/Cabal/Distribution/Types/ComponentName.hs → ...l/src/Distribution/Types/ComponentName.hs
diff --git a/...tribution/Types/ComponentRequestedSpec.hs → ...tribution/Types/ComponentRequestedSpec.hs b/...tribution/Types/ComponentRequestedSpec.hs → ...tribution/Types/ComponentRequestedSpec.hs
diff --git a/Cabal/Distribution/Types/CondTree.hs → Cabal/src/Distribution/Types/CondTree.hs b/Cabal/Distribution/Types/CondTree.hs → Cabal/src/Distribution/Types/CondTree.hs
diff --git a/Cabal/Distribution/Types/Condition.hs → Cabal/src/Distribution/Types/Condition.hs b/Cabal/Distribution/Types/Condition.hs → Cabal/src/Distribution/Types/Condition.hs
diff --git a/Cabal/Distribution/Types/ConfVar.hs → Cabal/src/Distribution/Types/ConfVar.hs b/Cabal/Distribution/Types/ConfVar.hs → Cabal/src/Distribution/Types/ConfVar.hs
diff --git a/Cabal/Distribution/Types/Dependency.hs → Cabal/src/Distribution/Types/Dependency.hs b/Cabal/Distribution/Types/Dependency.hs → Cabal/src/Distribution/Types/Dependency.hs
diff --git a/Cabal/Distribution/Types/DependencyMap.hs → ...l/src/Distribution/Types/DependencyMap.hs b/Cabal/Distribution/Types/DependencyMap.hs → ...l/src/Distribution/Types/DependencyMap.hs
diff --git a/Cabal/Distribution/Types/ExeDependency.hs → ...l/src/Distribution/Types/ExeDependency.hs b/Cabal/Distribution/Types/ExeDependency.hs → ...l/src/Distribution/Types/ExeDependency.hs
diff --git a/Cabal/Distribution/Types/Executable.hs → Cabal/src/Distribution/Types/Executable.hs b/Cabal/Distribution/Types/Executable.hs → Cabal/src/Distribution/Types/Executable.hs
diff --git a/Cabal/Distribution/Types/Executable/Lens.hs → ...src/Distribution/Types/Executable/Lens.hs b/Cabal/Distribution/Types/Executable/Lens.hs → ...src/Distribution/Types/Executable/Lens.hs
diff --git a/Cabal/Distribution/Types/ExecutableScope.hs → ...src/Distribution/Types/ExecutableScope.hs b/Cabal/Distribution/Types/ExecutableScope.hs → ...src/Distribution/Types/ExecutableScope.hs
diff --git a/Cabal/Distribution/Types/ExposedModule.hs → ...l/src/Distribution/Types/ExposedModule.hs b/Cabal/Distribution/Types/ExposedModule.hs → ...l/src/Distribution/Types/ExposedModule.hs
diff --git a/Cabal/Distribution/Types/Flag.hs → Cabal/src/Distribution/Types/Flag.hs b/Cabal/Distribution/Types/Flag.hs → Cabal/src/Distribution/Types/Flag.hs
diff --git a/Cabal/Distribution/Types/ForeignLib.hs → Cabal/src/Distribution/Types/ForeignLib.hs b/Cabal/Distribution/Types/ForeignLib.hs → Cabal/src/Distribution/Types/ForeignLib.hs
diff --git a/Cabal/Distribution/Types/ForeignLib/Lens.hs → ...src/Distribution/Types/ForeignLib/Lens.hs b/Cabal/Distribution/Types/ForeignLib/Lens.hs → ...src/Distribution/Types/ForeignLib/Lens.hs
diff --git a/Cabal/Distribution/Types/ForeignLibOption.hs → ...rc/Distribution/Types/ForeignLibOption.hs b/Cabal/Distribution/Types/ForeignLibOption.hs → ...rc/Distribution/Types/ForeignLibOption.hs
diff --git a/Cabal/Distribution/Types/ForeignLibType.hs → .../src/Distribution/Types/ForeignLibType.hs b/Cabal/Distribution/Types/ForeignLibType.hs → .../src/Distribution/Types/ForeignLibType.hs
diff --git a/...bution/Types/GenericPackageDescription.hs → ...bution/Types/GenericPackageDescription.hs b/...bution/Types/GenericPackageDescription.hs → ...bution/Types/GenericPackageDescription.hs
diff --git a/...n/Types/GenericPackageDescription/Lens.hs → ...n/Types/GenericPackageDescription/Lens.hs b/...n/Types/GenericPackageDescription/Lens.hs → ...n/Types/GenericPackageDescription/Lens.hs
diff --git a/Cabal/Distribution/Types/GivenComponent.hs → .../src/Distribution/Types/GivenComponent.hs b/Cabal/Distribution/Types/GivenComponent.hs → .../src/Distribution/Types/GivenComponent.hs
diff --git a/Cabal/Distribution/Types/HookedBuildInfo.hs → ...src/Distribution/Types/HookedBuildInfo.hs b/Cabal/Distribution/Types/HookedBuildInfo.hs → ...src/Distribution/Types/HookedBuildInfo.hs
diff --git a/Cabal/Distribution/Types/IncludeRenaming.hs → ...src/Distribution/Types/IncludeRenaming.hs b/Cabal/Distribution/Types/IncludeRenaming.hs → ...src/Distribution/Types/IncludeRenaming.hs
diff --git a/...istribution/Types/InstalledPackageInfo.hs → ...istribution/Types/InstalledPackageInfo.hs b/...istribution/Types/InstalledPackageInfo.hs → ...istribution/Types/InstalledPackageInfo.hs
diff --git a/...ypes/InstalledPackageInfo/FieldGrammar.hs → ...ypes/InstalledPackageInfo/FieldGrammar.hs b/...ypes/InstalledPackageInfo/FieldGrammar.hs → ...ypes/InstalledPackageInfo/FieldGrammar.hs
diff --git a/...bution/Types/InstalledPackageInfo/Lens.hs → ...bution/Types/InstalledPackageInfo/Lens.hs b/...bution/Types/InstalledPackageInfo/Lens.hs → ...bution/Types/InstalledPackageInfo/Lens.hs
diff --git a/...Distribution/Types/LegacyExeDependency.hs → ...Distribution/Types/LegacyExeDependency.hs b/...Distribution/Types/LegacyExeDependency.hs → ...Distribution/Types/LegacyExeDependency.hs
diff --git a/Cabal/Distribution/Types/Lens.hs → Cabal/src/Distribution/Types/Lens.hs b/Cabal/Distribution/Types/Lens.hs → Cabal/src/Distribution/Types/Lens.hs
diff --git a/Cabal/Distribution/Types/Library.hs → Cabal/src/Distribution/Types/Library.hs b/Cabal/Distribution/Types/Library.hs → Cabal/src/Distribution/Types/Library.hs
diff --git a/Cabal/Distribution/Types/Library/Lens.hs → Cabal/src/Distribution/Types/Library/Lens.hs b/Cabal/Distribution/Types/Library/Lens.hs → Cabal/src/Distribution/Types/Library/Lens.hs
diff --git a/Cabal/Distribution/Types/LibraryName.hs → Cabal/src/Distribution/Types/LibraryName.hs b/Cabal/Distribution/Types/LibraryName.hs → Cabal/src/Distribution/Types/LibraryName.hs
diff --git a/...l/Distribution/Types/LibraryVisibility.hs → ...c/Distribution/Types/LibraryVisibility.hs b/...l/Distribution/Types/LibraryVisibility.hs → ...c/Distribution/Types/LibraryVisibility.hs
diff --git a/Cabal/Distribution/Types/LocalBuildInfo.hs → .../src/Distribution/Types/LocalBuildInfo.hs b/Cabal/Distribution/Types/LocalBuildInfo.hs → .../src/Distribution/Types/LocalBuildInfo.hs
diff --git a/Cabal/Distribution/Types/Mixin.hs → Cabal/src/Distribution/Types/Mixin.hs b/Cabal/Distribution/Types/Mixin.hs → Cabal/src/Distribution/Types/Mixin.hs
diff --git a/Cabal/Distribution/Types/Module.hs → Cabal/src/Distribution/Types/Module.hs b/Cabal/Distribution/Types/Module.hs → Cabal/src/Distribution/Types/Module.hs
diff --git a/Cabal/Distribution/Types/ModuleReexport.hs → .../src/Distribution/Types/ModuleReexport.hs b/Cabal/Distribution/Types/ModuleReexport.hs → .../src/Distribution/Types/ModuleReexport.hs
diff --git a/Cabal/Distribution/Types/ModuleRenaming.hs → .../src/Distribution/Types/ModuleRenaming.hs b/Cabal/Distribution/Types/ModuleRenaming.hs → .../src/Distribution/Types/ModuleRenaming.hs
diff --git a/Cabal/Distribution/Types/MungedPackageId.hs → ...src/Distribution/Types/MungedPackageId.hs b/Cabal/Distribution/Types/MungedPackageId.hs → ...src/Distribution/Types/MungedPackageId.hs
diff --git a/...l/Distribution/Types/MungedPackageName.hs → ...c/Distribution/Types/MungedPackageName.hs b/...l/Distribution/Types/MungedPackageName.hs → ...c/Distribution/Types/MungedPackageName.hs
diff --git a/.../Distribution/Types/PackageDescription.hs → .../Distribution/Types/PackageDescription.hs b/.../Distribution/Types/PackageDescription.hs → .../Distribution/Types/PackageDescription.hs
diff --git a/...ribution/Types/PackageDescription/Lens.hs → ...ribution/Types/PackageDescription/Lens.hs b/...ribution/Types/PackageDescription/Lens.hs → ...ribution/Types/PackageDescription/Lens.hs
diff --git a/Cabal/Distribution/Types/PackageId.hs → Cabal/src/Distribution/Types/PackageId.hs b/Cabal/Distribution/Types/PackageId.hs → Cabal/src/Distribution/Types/PackageId.hs
diff --git a/Cabal/Distribution/Types/PackageId/Lens.hs → .../src/Distribution/Types/PackageId/Lens.hs b/Cabal/Distribution/Types/PackageId/Lens.hs → .../src/Distribution/Types/PackageId/Lens.hs
diff --git a/Cabal/Distribution/Types/PackageName.hs → Cabal/src/Distribution/Types/PackageName.hs b/Cabal/Distribution/Types/PackageName.hs → Cabal/src/Distribution/Types/PackageName.hs
diff --git a/...l/Distribution/Types/PackageName/Magic.hs → ...c/Distribution/Types/PackageName/Magic.hs b/...l/Distribution/Types/PackageName/Magic.hs → ...c/Distribution/Types/PackageName/Magic.hs
diff --git a/...ibution/Types/PackageVersionConstraint.hs → ...ibution/Types/PackageVersionConstraint.hs b/...ibution/Types/PackageVersionConstraint.hs → ...ibution/Types/PackageVersionConstraint.hs
diff --git a/...Distribution/Types/PkgconfigDependency.hs → ...Distribution/Types/PkgconfigDependency.hs b/...Distribution/Types/PkgconfigDependency.hs → ...Distribution/Types/PkgconfigDependency.hs
diff --git a/Cabal/Distribution/Types/PkgconfigName.hs → ...l/src/Distribution/Types/PkgconfigName.hs b/Cabal/Distribution/Types/PkgconfigName.hs → ...l/src/Distribution/Types/PkgconfigName.hs
diff --git a/Cabal/Distribution/Types/PkgconfigVersion.hs → ...rc/Distribution/Types/PkgconfigVersion.hs b/Cabal/Distribution/Types/PkgconfigVersion.hs → ...rc/Distribution/Types/PkgconfigVersion.hs
diff --git a/...stribution/Types/PkgconfigVersionRange.hs → ...stribution/Types/PkgconfigVersionRange.hs b/...stribution/Types/PkgconfigVersionRange.hs → ...stribution/Types/PkgconfigVersionRange.hs
diff --git a/Cabal/Distribution/Types/SetupBuildInfo.hs → .../src/Distribution/Types/SetupBuildInfo.hs b/Cabal/Distribution/Types/SetupBuildInfo.hs → .../src/Distribution/Types/SetupBuildInfo.hs
diff --git a/...Distribution/Types/SetupBuildInfo/Lens.hs → ...Distribution/Types/SetupBuildInfo/Lens.hs b/...Distribution/Types/SetupBuildInfo/Lens.hs → ...Distribution/Types/SetupBuildInfo/Lens.hs
diff --git a/Cabal/Distribution/Types/SourceRepo.hs → Cabal/src/Distribution/Types/SourceRepo.hs b/Cabal/Distribution/Types/SourceRepo.hs → Cabal/src/Distribution/Types/SourceRepo.hs
diff --git a/Cabal/Distribution/Types/SourceRepo/Lens.hs → ...src/Distribution/Types/SourceRepo/Lens.hs b/Cabal/Distribution/Types/SourceRepo/Lens.hs → ...src/Distribution/Types/SourceRepo/Lens.hs
diff --git a/Cabal/Distribution/Types/TargetInfo.hs → Cabal/src/Distribution/Types/TargetInfo.hs b/Cabal/Distribution/Types/TargetInfo.hs → Cabal/src/Distribution/Types/TargetInfo.hs
diff --git a/Cabal/Distribution/Types/TestSuite.hs → Cabal/src/Distribution/Types/TestSuite.hs b/Cabal/Distribution/Types/TestSuite.hs → Cabal/src/Distribution/Types/TestSuite.hs
diff --git a/Cabal/Distribution/Types/TestSuite/Lens.hs → .../src/Distribution/Types/TestSuite/Lens.hs b/Cabal/Distribution/Types/TestSuite/Lens.hs → .../src/Distribution/Types/TestSuite/Lens.hs
diff --git a/.../Distribution/Types/TestSuiteInterface.hs → .../Distribution/Types/TestSuiteInterface.hs b/.../Distribution/Types/TestSuiteInterface.hs → .../Distribution/Types/TestSuiteInterface.hs
diff --git a/Cabal/Distribution/Types/TestType.hs → Cabal/src/Distribution/Types/TestType.hs b/Cabal/Distribution/Types/TestType.hs → Cabal/src/Distribution/Types/TestType.hs
diff --git a/Cabal/Distribution/Types/UnitId.hs → Cabal/src/Distribution/Types/UnitId.hs b/Cabal/Distribution/Types/UnitId.hs → Cabal/src/Distribution/Types/UnitId.hs
diff --git a/...Distribution/Types/UnqualComponentName.hs → ...Distribution/Types/UnqualComponentName.hs b/...Distribution/Types/UnqualComponentName.hs → ...Distribution/Types/UnqualComponentName.hs
diff --git a/Cabal/Distribution/Types/Version.hs → Cabal/src/Distribution/Types/Version.hs b/Cabal/Distribution/Types/Version.hs → Cabal/src/Distribution/Types/Version.hs
diff --git a/Cabal/Distribution/Types/VersionInterval.hs → ...src/Distribution/Types/VersionInterval.hs b/Cabal/Distribution/Types/VersionInterval.hs → ...src/Distribution/Types/VersionInterval.hs
diff --git a/Cabal/Distribution/Types/VersionRange.hs → Cabal/src/Distribution/Types/VersionRange.hs b/Cabal/Distribution/Types/VersionRange.hs → Cabal/src/Distribution/Types/VersionRange.hs
diff --git a/...stribution/Types/VersionRange/Internal.hs → ...stribution/Types/VersionRange/Internal.hs b/...stribution/Types/VersionRange/Internal.hs → ...stribution/Types/VersionRange/Internal.hs
diff --git a/Cabal/Distribution/Utils/Base62.hs → Cabal/src/Distribution/Utils/Base62.hs b/Cabal/Distribution/Utils/Base62.hs → Cabal/src/Distribution/Utils/Base62.hs
diff --git a/Cabal/Distribution/Utils/Generic.hs → Cabal/src/Distribution/Utils/Generic.hs b/Cabal/Distribution/Utils/Generic.hs → Cabal/src/Distribution/Utils/Generic.hs
diff --git a/Cabal/Distribution/Utils/IOData.hs → Cabal/src/Distribution/Utils/IOData.hs b/Cabal/Distribution/Utils/IOData.hs → Cabal/src/Distribution/Utils/IOData.hs
diff --git a/Cabal/Distribution/Utils/LogProgress.hs → Cabal/src/Distribution/Utils/LogProgress.hs b/Cabal/Distribution/Utils/LogProgress.hs → Cabal/src/Distribution/Utils/LogProgress.hs
diff --git a/Cabal/Distribution/Utils/MD5.hs → Cabal/src/Distribution/Utils/MD5.hs b/Cabal/Distribution/Utils/MD5.hs → Cabal/src/Distribution/Utils/MD5.hs
diff --git a/Cabal/Distribution/Utils/MapAccum.hs → Cabal/src/Distribution/Utils/MapAccum.hs b/Cabal/Distribution/Utils/MapAccum.hs → Cabal/src/Distribution/Utils/MapAccum.hs
diff --git a/Cabal/Distribution/Utils/NubList.hs → Cabal/src/Distribution/Utils/NubList.hs b/Cabal/Distribution/Utils/NubList.hs → Cabal/src/Distribution/Utils/NubList.hs
diff --git a/Cabal/Distribution/Utils/Progress.hs → Cabal/src/Distribution/Utils/Progress.hs b/Cabal/Distribution/Utils/Progress.hs → Cabal/src/Distribution/Utils/Progress.hs
diff --git a/Cabal/Distribution/Utils/ShortText.hs → Cabal/src/Distribution/Utils/ShortText.hs b/Cabal/Distribution/Utils/ShortText.hs → Cabal/src/Distribution/Utils/ShortText.hs
diff --git a/Cabal/Distribution/Utils/String.hs → Cabal/src/Distribution/Utils/String.hs b/Cabal/Distribution/Utils/String.hs → Cabal/src/Distribution/Utils/String.hs
diff --git a/Cabal/Distribution/Utils/Structured.hs → Cabal/src/Distribution/Utils/Structured.hs b/Cabal/Distribution/Utils/Structured.hs → Cabal/src/Distribution/Utils/Structured.hs
diff --git a/Cabal/Distribution/Utils/UnionFind.hs → Cabal/src/Distribution/Utils/UnionFind.hs b/Cabal/Distribution/Utils/UnionFind.hs → Cabal/src/Distribution/Utils/UnionFind.hs
diff --git a/Cabal/Distribution/Verbosity.hs → Cabal/src/Distribution/Verbosity.hs b/Cabal/Distribution/Verbosity.hs → Cabal/src/Distribution/Verbosity.hs
diff --git a/Cabal/Distribution/Verbosity/Internal.hs → Cabal/src/Distribution/Verbosity/Internal.hs b/Cabal/Distribution/Verbosity/Internal.hs → Cabal/src/Distribution/Verbosity/Internal.hs
diff --git a/Cabal/Distribution/Version.hs → Cabal/src/Distribution/Version.hs b/Cabal/Distribution/Version.hs → Cabal/src/Distribution/Version.hs
diff --git a/Cabal/Distribution/ZinzaPrelude.hs → Cabal/src/Distribution/ZinzaPrelude.hs b/Cabal/Distribution/ZinzaPrelude.hs → Cabal/src/Distribution/ZinzaPrelude.hs
diff --git a/Cabal/Language/Haskell/Extension.hs → Cabal/src/Language/Haskell/Extension.hs b/Cabal/Language/Haskell/Extension.hs → Cabal/src/Language/Haskell/Extension.hs
diff --git a/Makefile b/Makefile
@@ -25,7 +25,7 @@ lib-ghc-7.8 :
 
 # source generation: Lexer
 
-LEXER_HS:=Cabal/Distribution/Fields/Lexer.hs
+LEXER_HS:=Cabal/src/Distribution/Fields/Lexer.hs
 
 lexer : $(LEXER_HS)
 
@@ -36,8 +36,8 @@ $(LEXER_HS) : boot/Lexer.x
 
 # source generation: SPDX
 
-SPDX_LICENSE_HS:=Cabal/Distribution/SPDX/LicenseId.hs
-SPDX_EXCEPTION_HS:=Cabal/Distribution/SPDX/LicenseExceptionId.hs
+SPDX_LICENSE_HS:=Cabal/src/Distribution/SPDX/LicenseId.hs
+SPDX_EXCEPTION_HS:=Cabal/src/Distribution/SPDX/LicenseExceptionId.hs
 
 spdx : $(SPDX_LICENSE_HS) $(SPDX_EXCEPTION_HS)
 
@@ -49,7 +49,7 @@ $(SPDX_EXCEPTION_HS) : boot/SPDX.LicenseExceptionId.template.hs cabal-dev-script
 
 # source generation: templates
 
-TEMPLATE_MACROS:=Cabal/Distribution/Simple/Build/Macros/Z.hs
+TEMPLATE_MACROS:=Cabal/src/Distribution/Simple/Build/Macros/Z.hs
 
 templates : $(TEMPLATE_MACROS)
 
@@ -89,7 +89,7 @@ gen-extra-source-files-lib :
 
 # analyse-imports
 analyse-imports : phony
-	find Cabal/Distribution cabal-install/Distribution -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --
+	find Cabal/src cabal-install/Distribution -type f -name '*.hs' | xargs cabal v2-run --builddir=dist-newstyle-meta --project-file=cabal.project.meta analyse-imports --
 
 # github actions
 github-actions : .github/workflows/artifacts.yml
@@ -119,7 +119,7 @@ ghcid-cli :
 # doctests (relies on .ghc.environment files)
 
 doctest :
-	doctest --fast Cabal/Distribution Cabal/Language
+	doctest --fast Cabal/src
 
 # This is not run as part of validate.sh (we need hackage-security, which is tricky to get).
 doctest-cli :
@@ -225,7 +225,7 @@ weeder :
 # tags
 .PHONY : tags
 tags :
-	hasktags -b Cabal/Distribution Cabal/Cabal-described/src Cabal/Language cabal-install/Distribution cabal-testsuite/src
+	hasktags -b Cabal/src Cabal/Cabal-described/src cabal-install/Distribution cabal-testsuite/src
 
 # documentation
 ##############################################################################