diff --git a/.gitignore b/.gitignore
index cdfe8d9e04..c7e9411b51 100644
--- a/.gitignore
+++ b/.gitignore
@@ -24,6 +24,5 @@ buildengine/.gitignore
 go.work*
 junit*.xml
 /readme-tests
-**/_ftl
 /docs/public
 .ftl.lock
diff --git a/backend/controller/controller.go b/backend/controller/controller.go
index a699fe31a1..496e3e4ebc 100644
--- a/backend/controller/controller.go
+++ b/backend/controller/controller.go
@@ -39,13 +39,13 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/scaling"
 	"github.com/TBD54566975/ftl/backend/controller/scaling/localscaling"
 	"github.com/TBD54566975/ftl/backend/controller/scheduledtask"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/console/pbconsoleconnect"
 	"github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/ftlv1connect"
 	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/backend/schema"
 	cf "github.com/TBD54566975/ftl/common/configuration"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	frontend "github.com/TBD54566975/ftl/frontend"
 	"github.com/TBD54566975/ftl/internal/cors"
 	ftlhttp "github.com/TBD54566975/ftl/internal/http"
diff --git a/backend/controller/dal/async_calls.go b/backend/controller/dal/async_calls.go
index 9b760b88b3..06f3d7a5ce 100644
--- a/backend/controller/dal/async_calls.go
+++ b/backend/controller/dal/async_calls.go
@@ -11,8 +11,8 @@ import (
 	"github.com/alecthomas/types/either"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 )
 
 type asyncOriginParseRoot struct {
diff --git a/backend/controller/dal/dal.go b/backend/controller/dal/dal.go
index d57862128f..dcc3e70e3a 100644
--- a/backend/controller/dal/dal.go
+++ b/backend/controller/dal/dal.go
@@ -17,9 +17,9 @@ import (
 	"google.golang.org/protobuf/proto"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/maps"
 	"github.com/TBD54566975/ftl/internal/model"
diff --git a/backend/controller/dal/dal_test.go b/backend/controller/dal/dal_test.go
index a1b0334c9c..76e9c8e99d 100644
--- a/backend/controller/dal/dal_test.go
+++ b/backend/controller/dal/dal_test.go
@@ -13,9 +13,9 @@ import (
 	"golang.org/x/sync/errgroup"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql/sqltest"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 	"github.com/TBD54566975/ftl/internal/sha256"
diff --git a/backend/controller/dal/events.go b/backend/controller/dal/events.go
index 54839d9dfc..69fc43335c 100644
--- a/backend/controller/dal/events.go
+++ b/backend/controller/dal/events.go
@@ -11,8 +11,8 @@ import (
 	"github.com/jackc/pgx/v5"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 )
diff --git a/backend/controller/dal/fsm.go b/backend/controller/dal/fsm.go
index cb1a599ea9..a88f2c42ec 100644
--- a/backend/controller/dal/fsm.go
+++ b/backend/controller/dal/fsm.go
@@ -11,8 +11,8 @@ import (
 
 	"github.com/TBD54566975/ftl/backend/controller/leases"
 	"github.com/TBD54566975/ftl/backend/controller/sql"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 )
 
 // StartFSMTransition sends an event to an executing instance of an FSM.
diff --git a/backend/controller/dal/fsm_test.go b/backend/controller/dal/fsm_test.go
index 02a8041ecf..68b2622ff4 100644
--- a/backend/controller/dal/fsm_test.go
+++ b/backend/controller/dal/fsm_test.go
@@ -9,8 +9,8 @@ import (
 	"github.com/alecthomas/types/either"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql/sqltest"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 )
 
diff --git a/backend/controller/dal/lease.go b/backend/controller/dal/lease.go
index 4188074813..d29625764c 100644
--- a/backend/controller/dal/lease.go
+++ b/backend/controller/dal/lease.go
@@ -12,7 +12,7 @@ import (
 
 	"github.com/TBD54566975/ftl/backend/controller/leases"
 	"github.com/TBD54566975/ftl/backend/controller/sql"
-	"github.com/TBD54566975/ftl/db/dalerrs"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/internal/log"
 )
 
diff --git a/backend/controller/dal/lease_test.go b/backend/controller/dal/lease_test.go
index 32684590e8..72782a45a9 100644
--- a/backend/controller/dal/lease_test.go
+++ b/backend/controller/dal/lease_test.go
@@ -13,7 +13,7 @@ import (
 	"github.com/TBD54566975/ftl/backend/controller/leases"
 	"github.com/TBD54566975/ftl/backend/controller/sql"
 	"github.com/TBD54566975/ftl/backend/controller/sql/sqltest"
-	"github.com/TBD54566975/ftl/db/dalerrs"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/internal/log"
 )
 
diff --git a/backend/controller/dal/notify.go b/backend/controller/dal/notify.go
index c3afa5975f..869b009a4f 100644
--- a/backend/controller/dal/notify.go
+++ b/backend/controller/dal/notify.go
@@ -12,7 +12,7 @@ import (
 	"github.com/jackc/pgx/v5"
 	"github.com/jpillora/backoff"
 
-	"github.com/TBD54566975/ftl/db/dalerrs"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 )
diff --git a/backend/controller/dal/pubsub.go b/backend/controller/dal/pubsub.go
index 815b720a10..8f086934c0 100644
--- a/backend/controller/dal/pubsub.go
+++ b/backend/controller/dal/pubsub.go
@@ -6,8 +6,8 @@ import (
 	"time"
 
 	"github.com/TBD54566975/ftl/backend/controller/sql"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 	"github.com/TBD54566975/ftl/internal/slices"
diff --git a/backend/controller/ingress/handler.go b/backend/controller/ingress/handler.go
index 349727628b..cb7ff5fba0 100644
--- a/backend/controller/ingress/handler.go
+++ b/backend/controller/ingress/handler.go
@@ -10,10 +10,10 @@ import (
 	"github.com/alecthomas/types/optional"
 
 	"github.com/TBD54566975/ftl/backend/controller/dal"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	ftlv1 "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1"
 	schemapb "github.com/TBD54566975/ftl/backend/protos/xyz/block/ftl/v1/schema"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/log"
 	"github.com/TBD54566975/ftl/internal/model"
 )
diff --git a/backend/controller/ingress/ingress.go b/backend/controller/ingress/ingress.go
index d35a62ddd0..afa896058a 100644
--- a/backend/controller/ingress/ingress.go
+++ b/backend/controller/ingress/ingress.go
@@ -11,8 +11,8 @@ import (
 	"time"
 
 	"github.com/TBD54566975/ftl/backend/controller/dal"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/backend/schema"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/TBD54566975/ftl/internal/slices"
 )
 
diff --git a/backend/controller/leader/leader.go b/backend/controller/leader/leader.go
index 1ce3c2cfc9..315cc0ac2c 100644
--- a/backend/controller/leader/leader.go
+++ b/backend/controller/leader/leader.go
@@ -21,10 +21,11 @@ import (
 	"sync"
 	"time"
 
+	"github.com/alecthomas/types/optional"
+
 	"github.com/TBD54566975/ftl/backend/controller/leases"
-	"github.com/TBD54566975/ftl/db/dalerrs"
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/internal/log"
-	"github.com/alecthomas/types/optional"
 )
 
 // LeaderFactory is a function that is called whenever a new leader is acquired.
diff --git a/db/dalerrs/dalerrs.go b/backend/dal/errors.go
similarity index 81%
rename from db/dalerrs/dalerrs.go
rename to backend/dal/errors.go
index 216ebbcfc8..867b773810 100644
--- a/db/dalerrs/dalerrs.go
+++ b/backend/dal/errors.go
@@ -1,7 +1,9 @@
-// Package dalerrs provides common error handling utilities for all domain-specific DALs,
-// e.g. controller DAL and configuration DAL, which all connect to the same underlying DB
-// and maintain the same interface guarantees
-package dalerrs
+// Package dal provides common types and functions for domain-specific DALs.
+//
+// In particular, common error types and error handling function for all
+// domain-specific DALs, e.g. controller DAL and configuration DAL, which all
+// connect to the same underlying DB and maintain the same interface guarantees
+package dal
 
 import (
 	stdsql "database/sql"
diff --git a/common/configuration/dal/dal.go b/common/configuration/dal/dal.go
index 7648792c62..0f592951d0 100644
--- a/common/configuration/dal/dal.go
+++ b/common/configuration/dal/dal.go
@@ -7,8 +7,8 @@ import (
 	"github.com/alecthomas/types/optional"
 	"github.com/jackc/pgx/v5/pgxpool"
 
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 	"github.com/TBD54566975/ftl/common/configuration/sql"
-	"github.com/TBD54566975/ftl/db/dalerrs"
 )
 
 type DAL struct {
diff --git a/common/configuration/db_config_provider.go b/common/configuration/db_config_provider.go
index 7337cfe436..0b79d560dd 100644
--- a/common/configuration/db_config_provider.go
+++ b/common/configuration/db_config_provider.go
@@ -4,8 +4,9 @@ import (
 	"context"
 	"net/url"
 
-	"github.com/TBD54566975/ftl/db/dalerrs"
 	"github.com/alecthomas/types/optional"
+
+	dalerrs "github.com/TBD54566975/ftl/backend/dal"
 )
 
 // DBConfigProvider is a configuration provider that stores configuration in its key.