diff --git a/beets/dbcore/__init__.py b/beets/dbcore/__init__.py
new file mode 100644
index 000000000..913351630
--- /dev/null
+++ b/beets/dbcore/__init__.py
@@ -0,0 +1,18 @@
+# This file is part of beets.
+# Copyright 2014, Adrian Sampson.
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+
+"""DBCore is an abstract database package that forms the basis for beets'
+Library.
+"""
+from .db import Type, Model, Database, Query, FieldQuery, MatchQuery
diff --git a/beets/dbcore.py b/beets/dbcore/db.py
similarity index 99%
rename from beets/dbcore.py
rename to beets/dbcore/db.py
index 60d2aa620..c155c2239 100644
--- a/beets/dbcore.py
+++ b/beets/dbcore/db.py
@@ -12,7 +12,7 @@
 # The above copyright notice and this permission notice shall be
 # included in all copies or substantial portions of the Software.
 
-"""An abstract database library that forms the basis for beets' Library.
+"""The central Model and Database constructs for DBCore.
 """
 import time
 import os
diff --git a/setup.py b/setup.py
index a0e693400..817a70f81 100755
--- a/setup.py
+++ b/setup.py
@@ -58,6 +58,7 @@ setup(name='beets',
           'beets.ui',
           'beets.autotag',
           'beets.util',
+          'beets.dbcore',
           'beetsplug',
           'beetsplug.bpd',
           'beetsplug.web',