diff --git a/src/backend/client/ensembles.rs b/src/backend/client/ensembles.rs
index f87919e..20b9ea6 100644
--- a/src/backend/client/ensembles.rs
+++ b/src/backend/client/ensembles.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Ensemble;
+use crate::backend::{Backend, Ensemble};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/backend/client/instruments.rs b/src/backend/client/instruments.rs
index 6b4a162..18f0178 100644
--- a/src/backend/client/instruments.rs
+++ b/src/backend/client/instruments.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Instrument;
+use crate::backend::{Backend, Instrument};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/backend/client/mediums.rs b/src/backend/client/mediums.rs
index 86a1028..fb9dc46 100644
--- a/src/backend/client/mediums.rs
+++ b/src/backend/client/mediums.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Medium;
+use crate::backend::{Backend, Medium};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/backend/client/persons.rs b/src/backend/client/persons.rs
index b864189..6bc0200 100644
--- a/src/backend/client/persons.rs
+++ b/src/backend/client/persons.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Person;
+use crate::backend::{Backend, Person};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/backend/client/recordings.rs b/src/backend/client/recordings.rs
index a836f25..0bfe382 100644
--- a/src/backend/client/recordings.rs
+++ b/src/backend/client/recordings.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Recording;
+use crate::backend::{Backend, Recording};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/backend/client/works.rs b/src/backend/client/works.rs
index a28cf34..2c6bc98 100644
--- a/src/backend/client/works.rs
+++ b/src/backend/client/works.rs
@@ -1,5 +1,4 @@
-use super::Backend;
-use crate::database::Work;
+use crate::backend::{Backend, Work};
 use anyhow::Result;
 
 impl Backend {
diff --git a/src/database/ensembles.rs b/src/backend/database/ensembles.rs
similarity index 100%
rename from src/database/ensembles.rs
rename to src/backend/database/ensembles.rs
diff --git a/src/database/instruments.rs b/src/backend/database/instruments.rs
similarity index 100%
rename from src/database/instruments.rs
rename to src/backend/database/instruments.rs
diff --git a/src/database/medium.rs b/src/backend/database/medium.rs
similarity index 100%
rename from src/database/medium.rs
rename to src/backend/database/medium.rs
diff --git a/src/database/mod.rs b/src/backend/database/mod.rs
similarity index 100%
rename from src/database/mod.rs
rename to src/backend/database/mod.rs
diff --git a/src/database/persons.rs b/src/backend/database/persons.rs
similarity index 100%
rename from src/database/persons.rs
rename to src/backend/database/persons.rs
diff --git a/src/database/recordings.rs b/src/backend/database/recordings.rs
similarity index 100%
rename from src/database/recordings.rs
rename to src/backend/database/recordings.rs
diff --git a/src/database/schema.rs b/src/backend/database/schema.rs
similarity index 100%
rename from src/database/schema.rs
rename to src/backend/database/schema.rs
diff --git a/src/database/thread.rs b/src/backend/database/thread.rs
similarity index 100%
rename from src/database/thread.rs
rename to src/backend/database/thread.rs
diff --git a/src/database/works.rs b/src/backend/database/works.rs
similarity index 100%
rename from src/database/works.rs
rename to src/backend/database/works.rs
diff --git a/src/backend/library.rs b/src/backend/library.rs
index ea0caf3..5a07043 100644
--- a/src/backend/library.rs
+++ b/src/backend/library.rs
@@ -1,5 +1,4 @@
-use super::{Backend, BackendState};
-use crate::database::DbThread;
+use super::{Backend, BackendState, DbThread};
 use crate::player::Player;
 use anyhow::Result;
 use gio::prelude::*;
diff --git a/src/backend/mod.rs b/src/backend/mod.rs
index ceb9aeb..9a8e837 100644
--- a/src/backend/mod.rs
+++ b/src/backend/mod.rs
@@ -1,4 +1,3 @@
-use crate::database::DbThread;
 use crate::player::Player;
 use anyhow::Result;
 use futures_channel::mpsc;
@@ -9,6 +8,9 @@ use std::rc::Rc;
 pub mod client;
 pub use client::*;
 
+pub mod database;
+pub use database::*;
+
 pub mod library;
 pub use library::*;
 
diff --git a/src/editors/ensemble.rs b/src/editors/ensemble.rs
index 1d2267e..d69e974 100644
--- a/src/editors/ensemble.rs
+++ b/src/editors/ensemble.rs
@@ -1,6 +1,5 @@
-use crate::backend::Backend;
-use crate::database::generate_id;
-use crate::database::Ensemble;
+use crate::backend::generate_id;
+use crate::backend::{Backend, Ensemble};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;
diff --git a/src/editors/instrument.rs b/src/editors/instrument.rs
index 03ee26c..0066c71 100644
--- a/src/editors/instrument.rs
+++ b/src/editors/instrument.rs
@@ -1,6 +1,5 @@
-use crate::backend::Backend;
-use crate::database::generate_id;
-use crate::database::Instrument;
+use crate::backend::generate_id;
+use crate::backend::{Backend, Instrument};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;
diff --git a/src/editors/performance.rs b/src/editors/performance.rs
index 9a5b8ea..0a34f4c 100644
--- a/src/editors/performance.rs
+++ b/src/editors/performance.rs
@@ -1,5 +1,4 @@
-use crate::backend::Backend;
-use crate::database::*;
+use crate::backend::{Backend, Performance, Person, Ensemble, Instrument};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::selectors::{EnsembleSelector, InstrumentSelector, PersonSelector};
 use crate::widgets::{Editor, Section, ButtonRow, Widget};
diff --git a/src/editors/person.rs b/src/editors/person.rs
index b7b726b..d1c20b4 100644
--- a/src/editors/person.rs
+++ b/src/editors/person.rs
@@ -1,6 +1,5 @@
-use crate::backend::Backend;
-use crate::database::generate_id;
-use crate::database::Person;
+use crate::backend::generate_id;
+use crate::backend::{Backend, Person};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{Editor, EntryRow, Section, UploadSection, Widget};
 use anyhow::Result;
diff --git a/src/editors/recording.rs b/src/editors/recording.rs
index e5d66c0..d930af1 100644
--- a/src/editors/recording.rs
+++ b/src/editors/recording.rs
@@ -1,6 +1,6 @@
 use super::performance::PerformanceEditor;
-use crate::backend::Backend;
-use crate::database::*;
+use crate::backend::generate_id;
+use crate::backend::{Backend, Performance, Person, Recording, Work};
 use crate::selectors::{PersonSelector, WorkSelector};
 use crate::widgets::{List, Widget};
 use crate::navigator::{NavigationHandle, Screen};
diff --git a/src/editors/work.rs b/src/editors/work.rs
index 9aa0fee..72f96d4 100644
--- a/src/editors/work.rs
+++ b/src/editors/work.rs
@@ -1,6 +1,7 @@
 use super::work_part::WorkPartEditor;
+use crate::backend::generate_id;
+use crate::backend::{Instrument, Person, Work, WorkPart, WorkSection};
 use super::work_section::WorkSectionEditor;
-use crate::database::*;
 use crate::selectors::{InstrumentSelector, PersonSelector};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{List, Widget};
diff --git a/src/editors/work_part.rs b/src/editors/work_part.rs
index 5288457..d7ee726 100644
--- a/src/editors/work_part.rs
+++ b/src/editors/work_part.rs
@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::{Person, WorkPart};
 use crate::selectors::PersonSelector;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/editors/work_section.rs b/src/editors/work_section.rs
index a40cefc..b474037 100644
--- a/src/editors/work_section.rs
+++ b/src/editors/work_section.rs
@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::WorkSection;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
 use glib::clone;
diff --git a/src/import/medium_editor.rs b/src/import/medium_editor.rs
index f4772e8..83b5b38 100644
--- a/src/import/medium_editor.rs
+++ b/src/import/medium_editor.rs
@@ -1,7 +1,7 @@
 use super::source::Source;
 use super::track_set_editor::{TrackSetData, TrackSetEditor};
-use crate::database::{generate_id, Medium, Track, TrackSet};
-use crate::backend::Backend;
+use crate::backend::generate_id;
+use crate::backend::{Backend, Medium, Track, TrackSet};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::{List, Widget};
 use anyhow::{anyhow, Result};
diff --git a/src/import/track_editor.rs b/src/import/track_editor.rs
index 739bb6c..a7219dd 100644
--- a/src/import/track_editor.rs
+++ b/src/import/track_editor.rs
@@ -1,4 +1,4 @@
-use crate::database::Recording;
+use crate::backend::Recording;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
 use glib::clone;
diff --git a/src/import/track_set_editor.rs b/src/import/track_set_editor.rs
index 60f07d2..30d62df 100644
--- a/src/import/track_set_editor.rs
+++ b/src/import/track_set_editor.rs
@@ -1,8 +1,7 @@
 use super::source::Source;
 use super::track_editor::TrackEditor;
 use super::track_selector::TrackSelector;
-use crate::backend::Backend;
-use crate::database::Recording;
+use crate::backend::{Backend, Recording};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::selectors::{PersonSelector, RecordingSelector};
 use crate::widgets::{List, Widget};
diff --git a/src/main.rs b/src/main.rs
index 5261920..3ba67cc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -16,7 +16,6 @@ mod macros;
 
 mod backend;
 mod config;
-mod database;
 mod editors;
 mod import;
 mod navigator;
diff --git a/src/meson.build b/src/meson.build
index 22731f4..89559a4 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -41,18 +41,18 @@ sources = files(
   'backend/client/recordings.rs',
   'backend/client/register.rs',
   'backend/client/works.rs',
+  'backend/database/ensembles.rs',
+  'backend/database/instruments.rs',
+  'backend/database/medium.rs',
+  'backend/database/mod.rs',
+  'backend/database/persons.rs',
+  'backend/database/recordings.rs',
+  'backend/database/schema.rs',
+  'backend/database/thread.rs',
+  'backend/database/works.rs',
   'backend/library.rs',
   'backend/mod.rs',
   'backend/secure.rs',
-  'database/ensembles.rs',
-  'database/instruments.rs',
-  'database/medium.rs',
-  'database/mod.rs',
-  'database/persons.rs',
-  'database/recordings.rs',
-  'database/schema.rs',
-  'database/thread.rs',
-  'database/works.rs',
   'editors/ensemble.rs',
   'editors/instrument.rs',
   'editors/mod.rs',
diff --git a/src/player.rs b/src/player.rs
index 31ba92e..a47d9ee 100644
--- a/src/player.rs
+++ b/src/player.rs
@@ -1,4 +1,4 @@
-use crate::database::*;
+use crate::backend::TrackSet;
 use anyhow::anyhow;
 use anyhow::Result;
 use gstreamer_player::prelude::*;
diff --git a/src/screens/ensemble.rs b/src/screens/ensemble.rs
index 2ae3496..ac90cf2 100644
--- a/src/screens/ensemble.rs
+++ b/src/screens/ensemble.rs
@@ -1,6 +1,5 @@
 use super::RecordingScreen;
-use crate::backend::Backend;
-use crate::database::{Ensemble, Recording};
+use crate::backend::{Backend, Ensemble, Recording};
 use crate::editors::EnsembleEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;
diff --git a/src/screens/person.rs b/src/screens/person.rs
index 074b32b..2b55f08 100644
--- a/src/screens/person.rs
+++ b/src/screens/person.rs
@@ -1,6 +1,5 @@
 use super::{WorkScreen, RecordingScreen};
-use crate::backend::Backend;
-use crate::database::{Person, Recording, Work};
+use crate::backend::{Backend, Person, Recording, Work};
 use crate::editors::PersonEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;
diff --git a/src/screens/recording.rs b/src/screens/recording.rs
index ec532e6..68d69ca 100644
--- a/src/screens/recording.rs
+++ b/src/screens/recording.rs
@@ -1,5 +1,4 @@
-use crate::backend::Backend;
-use crate::database::{Recording, TrackSet};
+use crate::backend::{Backend, Recording, TrackSet};
 use crate::editors::RecordingEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::player::PlaylistItem;
diff --git a/src/screens/work.rs b/src/screens/work.rs
index 0b1c4ba..1e3dcc6 100644
--- a/src/screens/work.rs
+++ b/src/screens/work.rs
@@ -1,6 +1,5 @@
 use super::RecordingScreen;
-use crate::backend::Backend;
-use crate::database::{Work, Recording};
+use crate::backend::{Backend, Work, Recording};
 use crate::editors::WorkEditor;
 use crate::navigator::{NavigatorWindow, NavigationHandle, Screen};
 use crate::widgets;
diff --git a/src/selectors/ensemble.rs b/src/selectors/ensemble.rs
index 39ac8c3..3b0bcad 100644
--- a/src/selectors/ensemble.rs
+++ b/src/selectors/ensemble.rs
@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
-use crate::database::Ensemble;
+use crate::backend::{Backend, Ensemble};
 use crate::editors::EnsembleEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/selectors/instrument.rs b/src/selectors/instrument.rs
index a1cbf29..a8e8ddc 100644
--- a/src/selectors/instrument.rs
+++ b/src/selectors/instrument.rs
@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
-use crate::database::Instrument;
+use crate::backend::{Backend, Instrument};
 use crate::editors::InstrumentEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/selectors/person.rs b/src/selectors/person.rs
index cfe3332..e8b7739 100644
--- a/src/selectors/person.rs
+++ b/src/selectors/person.rs
@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
-use crate::database::Person;
+use crate::backend::{Backend, Person};
 use crate::editors::PersonEditor;
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/selectors/recording.rs b/src/selectors/recording.rs
index 86c6722..95700be 100644
--- a/src/selectors/recording.rs
+++ b/src/selectors/recording.rs
@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
-use crate::database::{Person, Work, Recording};
+use crate::backend::{Backend, Person, Work, Recording};
 use crate::editors::{PersonEditor, WorkEditor, RecordingEditor};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/selectors/work.rs b/src/selectors/work.rs
index 43ad346..f81e42d 100644
--- a/src/selectors/work.rs
+++ b/src/selectors/work.rs
@@ -1,6 +1,5 @@
 use super::selector::Selector;
-use crate::backend::Backend;
-use crate::database::{Person, Work};
+use crate::backend::{Backend, Person, Work};
 use crate::editors::{PersonEditor, WorkEditor};
 use crate::navigator::{NavigationHandle, Screen};
 use crate::widgets::Widget;
diff --git a/src/widgets/poe_list.rs b/src/widgets/poe_list.rs
index 15a7ba8..e5daa1a 100644
--- a/src/widgets/poe_list.rs
+++ b/src/widgets/poe_list.rs
@@ -1,6 +1,5 @@
 use super::*;
-use crate::backend::Backend;
-use crate::database::*;
+use crate::backend::{Backend, Person, Ensemble};
 use glib::clone;
 use gtk::prelude::*;
 use gtk_macros::get_widget;