PostgREST · wolfgangwalther · Jul 14, 2026 · Jul 8, 2026
diff --git a/docs/explanations/architecture.rst b/docs/explanations/architecture.rst
@@ -36,53 +36,53 @@ The starting point of the program is `Main.hs <https://github.com/PostgREST/post
 CLI
 ---
 
-Main then calls `CLI.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/CLI.hs>`_, which is in charge of :ref:`cli`.
+Main then calls `CLI.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/CLI.hs>`_, which is in charge of :ref:`cli`.
 
 App
 ---
 
-`App.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/App.hs>`_ is then in charge of composing the different modules.
+`App.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/App.hs>`_ is then in charge of composing the different modules.
 
 Auth
 ----
 
-`Auth.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Auth.hs>`_ is in charge  of :ref:`authn`.
+`Auth.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Auth.hs>`_ is in charge  of :ref:`authn`.
 
 Api Request
 -----------
 
-`ApiRequest.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/ApiRequest.hs>`_ is in charge of parsing the URL query string (following PostgREST syntax), the request headers, and the request body.
+`ApiRequest.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/ApiRequest.hs>`_ is in charge of parsing the URL query string (following PostgREST syntax), the request headers, and the request body.
 
 A request might be rejected at this level if it's invalid. For example when providing an unknown media type to PostgREST or using an unknown HTTP method.
 
 Plan
 ----
 
-Using the Schema Cache, `Plan.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Plan.hs>`_ generates an internal AST, filling out-of-band SQL details (like an ``ON CONFLICT (pk)`` clause) required to complete the user request.
+Using the Schema Cache, `Plan.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Plan.hs>`_ generates an internal AST, filling out-of-band SQL details (like an ``ON CONFLICT (pk)`` clause) required to complete the user request.
 
 A request might be rejected at this level if it's invalid. For example when doing resource embedding on a nonexistent resource.
 
 Query
 -----
 
-`Query.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Query.hs>`_ generates the SQL queries (parametrized and prepared) required to satisfy the user request.
+`Query.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Query.hs>`_ generates the SQL queries (parametrized and prepared) required to satisfy the user request.
 
 Only at this stage a connection from the pool might be used.
 
 Schema Cache
 ------------
 
-`SchemaCache.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/SchemaCache.hs>`_ is in charge of :ref:`schema_cache`.
+`SchemaCache.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/SchemaCache.hs>`_ is in charge of :ref:`schema_cache`.
 
 Config
 ------
 
-`Config.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Config.hs>`_ is in charge of :ref:`configuration`.
+`Config.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Config.hs>`_ is in charge of :ref:`configuration`.
 
 Admin
 -----
 
-`Admin.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Admin.hs>`_ is in charge of the :ref:`admin_server`.
+`Admin.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Admin.hs>`_ is in charge of the :ref:`admin_server`.
 
 HTTP
 ----
@@ -92,4 +92,4 @@ The HTTP server is provided by `Warp <https://aosabook.org/en/posa/warp.html>`_.
 Listener
 --------
 
-`Listener.hs <https://github.com/PostgREST/postgrest/blob/main/src/PostgREST/Listener.hs>`_ is in charge of the :ref:`listener`.
+`Listener.hs <https://github.com/PostgREST/postgrest/blob/main/src/library/PostgREST/Listener.hs>`_ is in charge of the :ref:`listener`.
diff --git a/nix/hsie/README.md b/nix/hsie/README.md
@@ -5,10 +5,10 @@ project. It's available in PostgREST's `nix-shell` by default.
 
 ## Dumping imports
 
-Given source code in the directories `src` and `main`, for example, you can run:
+Given source code in the directories `src/library` and `src/executable`, for example, you can run:
 
 ```
-hsie dump-imports src main
+hsie dump-imports src/library src/executable
 ```
 
 This dumps all imports of the modules in the given directory to a CSV file,
@@ -18,7 +18,7 @@ To dump to a JSON file (e.g., to further process with `jq`), add the `--json`
 flag:
 
 ```
-hsie dump-imports --json src main
+hsie dump-imports --json src/library src/executable
 ```
 
 ## Graphing imports
@@ -27,7 +27,7 @@ The tool can generate `graphviz` graphs of module and symbol imports by printing
 a file to `stdout` that can directly be rendered with `dot`:
 
 ```
-hsie graph-modules src main | dot -Tpng -o modules.png
+hsie graph-modules src/library src/executable | dot -Tpng -o modules.png
 ```
 
 The command `graph-modules` prints a graph of which modules insert which other
@@ -39,7 +39,7 @@ To check whether modules are imported under consistent aliases in your project,
 run:
 
 ```
-hsie check-aliases main src
+hsie check-aliases src/library src/executable
 ```
 
 This will exit with a non-zero exit code if any inconsistent aliases are found.
@@ -48,13 +48,13 @@ The following command checks whether any modules are imported as wildcards, i.e.
 not qualified and without specifying symbols.
 
 ```
-hsie check-wildcards main src
+hsie check-wildcards src/library src/executable
 ```
 
 To whitelist certain modules to be imported as wildcards, use `--ok`:
 
 ```
-hsie check-wildcards main src --ok Protolude --ok Test.Module
+hsie check-wildcards src/library src/executable --ok Protolude --ok Test.Module
 ```
 
 ## Current limitations

diff --git a/nix/tools/devTools.nix b/nix/tools/devTools.nix
@@ -132,7 +132,7 @@ let
         args = [ "ARG_OPTIONAL_SINGLE([outfile], [o], [Output filename], [postgrest-module-graph.png])" ];
       }
       ''
-        ${hsie} graph-modules main src | ${graphviz}/bin/dot -Tpng -o "$_arg_outfile"
+        ${hsie} graph-modules src/library src/executable | ${graphviz}/bin/dot -Tpng -o "$_arg_outfile"
       '';
 
   hsieGraphSymbols =

diff --git a/nix/tools/style.nix b/nix/tools/style.nix
@@ -88,7 +88,7 @@ let
         ${ruff}/bin/ruff check .
 
         echo "Checking consistency of import aliases in Haskell code..."
-        ${hsie} check-aliases main src
+        ${hsie} check-aliases src/library src/executable
 
         echo "Linting Haskell files..."
         ${fd}/bin/fd '\.l?hs$' \

diff --git a/postgrest.cabal b/postgrest.cabal
@@ -42,7 +42,7 @@ library
   default-extensions: OverloadedStrings
                       NoImplicitPrelude
                       NumericUnderscores
-  hs-source-dirs:     src
+  hs-source-dirs:     src/library
   exposed-modules:    PostgREST.Admin
                       PostgREST.App
                       PostgREST.AppState
@@ -194,7 +194,7 @@ executable postgrest
   default-language:   Haskell2010
   default-extensions: OverloadedStrings
                       NoImplicitPrelude
-  hs-source-dirs:     main
+  hs-source-dirs:     src/executable
   main-is:            Main.hs
   build-depends:      base                >= 4.9 && < 4.22
                     , containers          >= 0.5.7 && < 0.8

diff --git a/main/Main.hs → src/executable/Main.hs b/main/Main.hs → src/executable/Main.hs
diff --git a/src/PostgREST/Admin.hs → src/library/PostgREST/Admin.hs b/src/PostgREST/Admin.hs → src/library/PostgREST/Admin.hs
diff --git a/src/PostgREST/ApiRequest.hs → src/library/PostgREST/ApiRequest.hs b/src/PostgREST/ApiRequest.hs → src/library/PostgREST/ApiRequest.hs
diff --git a/src/PostgREST/ApiRequest/Payload.hs → src/library/PostgREST/ApiRequest/Payload.hs b/src/PostgREST/ApiRequest/Payload.hs → src/library/PostgREST/ApiRequest/Payload.hs
diff --git a/src/PostgREST/ApiRequest/Preferences.hs → ...brary/PostgREST/ApiRequest/Preferences.hs b/src/PostgREST/ApiRequest/Preferences.hs → ...brary/PostgREST/ApiRequest/Preferences.hs
diff --git a/src/PostgREST/ApiRequest/QueryParams.hs → ...brary/PostgREST/ApiRequest/QueryParams.hs b/src/PostgREST/ApiRequest/QueryParams.hs → ...brary/PostgREST/ApiRequest/QueryParams.hs
diff --git a/src/PostgREST/ApiRequest/Types.hs → src/library/PostgREST/ApiRequest/Types.hs b/src/PostgREST/ApiRequest/Types.hs → src/library/PostgREST/ApiRequest/Types.hs
diff --git a/src/PostgREST/App.hs → src/library/PostgREST/App.hs b/src/PostgREST/App.hs → src/library/PostgREST/App.hs
diff --git a/src/PostgREST/AppState.hs → src/library/PostgREST/AppState.hs b/src/PostgREST/AppState.hs → src/library/PostgREST/AppState.hs
diff --git a/src/PostgREST/Auth.hs → src/library/PostgREST/Auth.hs b/src/PostgREST/Auth.hs → src/library/PostgREST/Auth.hs
diff --git a/src/PostgREST/Auth/Jwt.hs → src/library/PostgREST/Auth/Jwt.hs b/src/PostgREST/Auth/Jwt.hs → src/library/PostgREST/Auth/Jwt.hs
diff --git a/src/PostgREST/Auth/JwtCache.hs → src/library/PostgREST/Auth/JwtCache.hs b/src/PostgREST/Auth/JwtCache.hs → src/library/PostgREST/Auth/JwtCache.hs
diff --git a/src/PostgREST/Auth/Types.hs → src/library/PostgREST/Auth/Types.hs b/src/PostgREST/Auth/Types.hs → src/library/PostgREST/Auth/Types.hs
diff --git a/src/PostgREST/CLI.hs → src/library/PostgREST/CLI.hs b/src/PostgREST/CLI.hs → src/library/PostgREST/CLI.hs
diff --git a/src/PostgREST/Cache/Sieve.hs → src/library/PostgREST/Cache/Sieve.hs b/src/PostgREST/Cache/Sieve.hs → src/library/PostgREST/Cache/Sieve.hs
diff --git a/src/PostgREST/Client.hs → src/library/PostgREST/Client.hs b/src/PostgREST/Client.hs → src/library/PostgREST/Client.hs
diff --git a/src/PostgREST/Config.hs → src/library/PostgREST/Config.hs b/src/PostgREST/Config.hs → src/library/PostgREST/Config.hs
diff --git a/src/PostgREST/Config/Database.hs → src/library/PostgREST/Config/Database.hs b/src/PostgREST/Config/Database.hs → src/library/PostgREST/Config/Database.hs
diff --git a/src/PostgREST/Config/JSPath.hs → src/library/PostgREST/Config/JSPath.hs b/src/PostgREST/Config/JSPath.hs → src/library/PostgREST/Config/JSPath.hs
diff --git a/src/PostgREST/Config/PgVersion.hs → src/library/PostgREST/Config/PgVersion.hs b/src/PostgREST/Config/PgVersion.hs → src/library/PostgREST/Config/PgVersion.hs
diff --git a/src/PostgREST/Config/Proxy.hs → src/library/PostgREST/Config/Proxy.hs b/src/PostgREST/Config/Proxy.hs → src/library/PostgREST/Config/Proxy.hs
diff --git a/src/PostgREST/Cors.hs → src/library/PostgREST/Cors.hs b/src/PostgREST/Cors.hs → src/library/PostgREST/Cors.hs
diff --git a/src/PostgREST/Debounce.hs → src/library/PostgREST/Debounce.hs b/src/PostgREST/Debounce.hs → src/library/PostgREST/Debounce.hs
diff --git a/src/PostgREST/Error.hs → src/library/PostgREST/Error.hs b/src/PostgREST/Error.hs → src/library/PostgREST/Error.hs
diff --git a/src/PostgREST/Error/Types.hs → src/library/PostgREST/Error/Types.hs b/src/PostgREST/Error/Types.hs → src/library/PostgREST/Error/Types.hs
diff --git a/src/PostgREST/Listener.hs → src/library/PostgREST/Listener.hs b/src/PostgREST/Listener.hs → src/library/PostgREST/Listener.hs
diff --git a/src/PostgREST/Logger.hs → src/library/PostgREST/Logger.hs b/src/PostgREST/Logger.hs → src/library/PostgREST/Logger.hs
diff --git a/src/PostgREST/Logger/Apache.hs → src/library/PostgREST/Logger/Apache.hs b/src/PostgREST/Logger/Apache.hs → src/library/PostgREST/Logger/Apache.hs
diff --git a/src/PostgREST/MainTx.hs → src/library/PostgREST/MainTx.hs b/src/PostgREST/MainTx.hs → src/library/PostgREST/MainTx.hs
diff --git a/src/PostgREST/MediaType.hs → src/library/PostgREST/MediaType.hs b/src/PostgREST/MediaType.hs → src/library/PostgREST/MediaType.hs
diff --git a/src/PostgREST/Metrics.hs → src/library/PostgREST/Metrics.hs b/src/PostgREST/Metrics.hs → src/library/PostgREST/Metrics.hs
diff --git a/src/PostgREST/Network.hs → src/library/PostgREST/Network.hs b/src/PostgREST/Network.hs → src/library/PostgREST/Network.hs
diff --git a/src/PostgREST/Observation.hs → src/library/PostgREST/Observation.hs b/src/PostgREST/Observation.hs → src/library/PostgREST/Observation.hs
diff --git a/src/PostgREST/Plan.hs → src/library/PostgREST/Plan.hs b/src/PostgREST/Plan.hs → src/library/PostgREST/Plan.hs
diff --git a/src/PostgREST/Plan/CallPlan.hs → src/library/PostgREST/Plan/CallPlan.hs b/src/PostgREST/Plan/CallPlan.hs → src/library/PostgREST/Plan/CallPlan.hs
diff --git a/src/PostgREST/Plan/MutatePlan.hs → src/library/PostgREST/Plan/MutatePlan.hs b/src/PostgREST/Plan/MutatePlan.hs → src/library/PostgREST/Plan/MutatePlan.hs
diff --git a/src/PostgREST/Plan/Negotiate.hs → src/library/PostgREST/Plan/Negotiate.hs b/src/PostgREST/Plan/Negotiate.hs → src/library/PostgREST/Plan/Negotiate.hs
diff --git a/src/PostgREST/Plan/ReadPlan.hs → src/library/PostgREST/Plan/ReadPlan.hs b/src/PostgREST/Plan/ReadPlan.hs → src/library/PostgREST/Plan/ReadPlan.hs
diff --git a/src/PostgREST/Plan/Types.hs → src/library/PostgREST/Plan/Types.hs b/src/PostgREST/Plan/Types.hs → src/library/PostgREST/Plan/Types.hs
diff --git a/src/PostgREST/Query.hs → src/library/PostgREST/Query.hs b/src/PostgREST/Query.hs → src/library/PostgREST/Query.hs
diff --git a/src/PostgREST/Query/PreQuery.hs → src/library/PostgREST/Query/PreQuery.hs b/src/PostgREST/Query/PreQuery.hs → src/library/PostgREST/Query/PreQuery.hs
diff --git a/src/PostgREST/Query/QueryBuilder.hs → src/library/PostgREST/Query/QueryBuilder.hs b/src/PostgREST/Query/QueryBuilder.hs → src/library/PostgREST/Query/QueryBuilder.hs
diff --git a/src/PostgREST/Query/SqlFragment.hs → src/library/PostgREST/Query/SqlFragment.hs b/src/PostgREST/Query/SqlFragment.hs → src/library/PostgREST/Query/SqlFragment.hs
diff --git a/src/PostgREST/Query/Statements.hs → src/library/PostgREST/Query/Statements.hs b/src/PostgREST/Query/Statements.hs → src/library/PostgREST/Query/Statements.hs
diff --git a/src/PostgREST/RangeQuery.hs → src/library/PostgREST/RangeQuery.hs b/src/PostgREST/RangeQuery.hs → src/library/PostgREST/RangeQuery.hs
diff --git a/src/PostgREST/Response.hs → src/library/PostgREST/Response.hs b/src/PostgREST/Response.hs → src/library/PostgREST/Response.hs
diff --git a/src/PostgREST/Response/GucHeader.hs → src/library/PostgREST/Response/GucHeader.hs b/src/PostgREST/Response/GucHeader.hs → src/library/PostgREST/Response/GucHeader.hs
diff --git a/src/PostgREST/Response/OpenAPI.hs → src/library/PostgREST/Response/OpenAPI.hs b/src/PostgREST/Response/OpenAPI.hs → src/library/PostgREST/Response/OpenAPI.hs
diff --git a/src/PostgREST/Response/Performance.hs → ...library/PostgREST/Response/Performance.hs b/src/PostgREST/Response/Performance.hs → ...library/PostgREST/Response/Performance.hs
diff --git a/src/PostgREST/SchemaCache.hs → src/library/PostgREST/SchemaCache.hs b/src/PostgREST/SchemaCache.hs → src/library/PostgREST/SchemaCache.hs
diff --git a/src/PostgREST/SchemaCache/Identifiers.hs → ...rary/PostgREST/SchemaCache/Identifiers.hs b/src/PostgREST/SchemaCache/Identifiers.hs → ...rary/PostgREST/SchemaCache/Identifiers.hs
diff --git a/src/PostgREST/SchemaCache/Relationship.hs → ...ary/PostgREST/SchemaCache/Relationship.hs b/src/PostgREST/SchemaCache/Relationship.hs → ...ary/PostgREST/SchemaCache/Relationship.hs
diff --git a/src/PostgREST/SchemaCache/Representations.hs → .../PostgREST/SchemaCache/Representations.hs b/src/PostgREST/SchemaCache/Representations.hs → .../PostgREST/SchemaCache/Representations.hs
diff --git a/src/PostgREST/SchemaCache/Routine.hs → src/library/PostgREST/SchemaCache/Routine.hs b/src/PostgREST/SchemaCache/Routine.hs → src/library/PostgREST/SchemaCache/Routine.hs
diff --git a/src/PostgREST/SchemaCache/Table.hs → src/library/PostgREST/SchemaCache/Table.hs b/src/PostgREST/SchemaCache/Table.hs → src/library/PostgREST/SchemaCache/Table.hs
diff --git a/src/PostgREST/TimeIt.hs → src/library/PostgREST/TimeIt.hs b/src/PostgREST/TimeIt.hs → src/library/PostgREST/TimeIt.hs
diff --git a/src/PostgREST/Unix.hs → src/library/PostgREST/Unix.hs b/src/PostgREST/Unix.hs → src/library/PostgREST/Unix.hs
diff --git a/src/PostgREST/Version.hs → src/library/PostgREST/Version.hs b/src/PostgREST/Version.hs → src/library/PostgREST/Version.hs