diff --git a/configure.ac b/configure.ac
index b3e0d2ca83..911153cd13 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,7 @@ AC_CONFIG_FILES([Makefile
                  src/lib/cc/Makefile
                  src/lib/python/Makefile
                  src/lib/python/isc/Makefile
-                 src/lib/python/isc/auth/Makefile
+                 src/lib/python/isc/datasrc/Makefile
                  src/lib/python/isc/cc/Makefile
                  src/lib/python/isc/cc/tests/Makefile
                  src/lib/python/isc/config/Makefile
@@ -401,8 +401,8 @@ AC_CONFIG_FILES([Makefile
                  src/lib/dns/Makefile
                  src/lib/dns/tests/Makefile
                  src/lib/exceptions/Makefile
-                 src/lib/auth/Makefile
-                 src/lib/auth/tests/Makefile
+                 src/lib/datasrc/Makefile
+                 src/lib/datasrc/tests/Makefile
                  src/lib/xfr/Makefile
                ])
 AC_OUTPUT([src/bin/cfgmgr/b10-cfgmgr.py
diff --git a/src/bin/auth/Makefile.am b/src/bin/auth/Makefile.am
index 040cc4aafd..e976634271 100644
--- a/src/bin/auth/Makefile.am
+++ b/src/bin/auth/Makefile.am
@@ -27,8 +27,8 @@ pkglibexec_PROGRAMS = b10-auth
 b10_auth_SOURCES = auth_srv.cc auth_srv.h
 b10_auth_SOURCES += common.h
 b10_auth_SOURCES += main.cc
-b10_auth_LDADD =  $(top_builddir)/src/lib/auth/.libs/libauth.a
-b10_auth_LDADD +=  $(top_builddir)/src/lib/dns/.libs/libdns.a
+b10_auth_LDADD =  $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a
+b10_auth_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a
 b10_auth_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 b10_auth_LDADD += $(top_builddir)/src/lib/cc/libcc.a
 b10_auth_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
diff --git a/src/bin/auth/auth_srv.cc b/src/bin/auth/auth_srv.cc
index 9a466a40f8..bdb863160e 100644
--- a/src/bin/auth/auth_srv.cc
+++ b/src/bin/auth/auth_srv.cc
@@ -33,10 +33,10 @@
 #include <cc/data.h>
 #include <exceptions/exceptions.h>
 
-#include <auth/query.h>
-#include <auth/data_source.h>
-#include <auth/static_datasrc.h>
-#include <auth/sqlite3_datasrc.h>
+#include <datasrc/query.h>
+#include <datasrc/data_source.h>
+#include <datasrc/static_datasrc.h>
+#include <datasrc/sqlite3_datasrc.h>
 
 #include <cc/data.h>
 
@@ -48,7 +48,7 @@
 using namespace std;
 
 using namespace isc;
-using namespace isc::auth;
+using namespace isc::datasrc;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
 using namespace isc::data;
diff --git a/src/bin/auth/tests/Makefile.am b/src/bin/auth/tests/Makefile.am
index fa8f95c40b..f89803fac8 100644
--- a/src/bin/auth/tests/Makefile.am
+++ b/src/bin/auth/tests/Makefile.am
@@ -16,7 +16,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD += $(SQLITE_LIBS)
-run_unittests_LDADD +=  $(top_builddir)/src/lib/auth/.libs/libauth.a
+run_unittests_LDADD +=  $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a
 run_unittests_LDADD +=  $(top_builddir)/src/lib/dns/.libs/libdns.a
 run_unittests_LDADD += $(top_builddir)/src/lib/config/.libs/libcfgclient.a
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a
diff --git a/src/bin/loadzone/b10-loadzone.py.in b/src/bin/loadzone/b10-loadzone.py.in
index fdb51d2ca5..ebb8ec1274 100644
--- a/src/bin/loadzone/b10-loadzone.py.in
+++ b/src/bin/loadzone/b10-loadzone.py.in
@@ -17,8 +17,8 @@
 
 import sys; sys.path.append ('@@PYTHONPATH@@')
 import re, getopt
-import isc.auth
-from isc.auth.master import MasterFile
+import isc.datasrc
+from isc.datasrc.master import MasterFile
 
 #########################################################################
 # usage: print usage note and exit
@@ -71,10 +71,10 @@ def main():
         exit(1)
 
     try:
-        isc.auth.sqlite3_ds.load(dbfile, zone, master.zonedata)
+        isc.datasrc.sqlite3_ds.load(dbfile, zone, master.zonedata)
     except Exception as e:
         print("Error loading database: " + str(e))
         exit(1)
 
 if __name__ == "__main__":
-    main()
+    main(datasrc
diff --git a/src/bin/xfrin/xfrin.py.in b/src/bin/xfrin/xfrin.py.in
index 7f33ca378e..ba41f8d3dd 100644
--- a/src/bin/xfrin/xfrin.py.in
+++ b/src/bin/xfrin/xfrin.py.in
@@ -165,8 +165,8 @@ class XfrinConnection(asyncore.dispatcher):
             if ret == XFRIN_OK:    
                 self.log_msg(logstr + 'started')
                 self._send_query(rr_type.AXFR())
-                isc.auth.sqlite3_ds.load(self._db_file, self._zone_name,
-                                         self._handle_xfrin_response)
+                isc.datasrc.sqlite3_ds.load(self._db_file, self._zone_name,
+                                            self._handle_xfrin_response)
 
                 self.log_msg(logstr + 'succeeded')
 
@@ -174,7 +174,7 @@ class XfrinConnection(asyncore.dispatcher):
             self.log_msg(e)
             self.log_msg(logstr + 'failed')
             #TODO, recover data source.
-        except isc.auth.sqlite3_ds.Sqlite3DSError as e:
+        except isc.datasrc.sqlite3_ds.Sqlite3DSError as e:
             self.log_msg(e)
             self.log_msg(logstr + 'failed')
         finally:
diff --git a/src/bin/xfrout/xfrout.py.in b/src/bin/xfrout/xfrout.py.in
index 6a4c1852c5..7099bf1e93 100644
--- a/src/bin/xfrout/xfrout.py.in
+++ b/src/bin/xfrout/xfrout.py.in
@@ -22,7 +22,7 @@ import isc.cc
 import threading
 import struct
 import signal
-from isc.auth import sqlite3_ds
+from isc.datasrc import sqlite3_ds
 from socketserver import *
 import os
 from isc.config.ccsession import *
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 1b52d8b909..c74ffd2f56 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = exceptions dns cc config auth python
+SUBDIRS = exceptions dns cc config datasrc python
 if HAVE_BOOST_PYTHON
 if HAVE_BOOST_SYSTEM
 SUBDIRS += xfr
diff --git a/src/lib/auth/Makefile.am b/src/lib/auth/Makefile.am
deleted file mode 100644
index 4d9623567d..0000000000
--- a/src/lib/auth/Makefile.am
+++ /dev/null
@@ -1,13 +0,0 @@
-SUBDIRS = . tests
-
-AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
-AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
-AM_CPPFLAGS += $(SQLITE_CFLAGS)
-
-CLEANFILES = *.gcno *.gcda
-
-lib_LTLIBRARIES = libauth.la
-libauth_la_SOURCES = data_source.h data_source.cc
-libauth_la_SOURCES += static_datasrc.h static_datasrc.cc
-libauth_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
-libauth_la_SOURCES += query.h query.cc
diff --git a/src/lib/auth/TODO b/src/lib/auth/TODO
deleted file mode 100644
index 2ee55f2976..0000000000
--- a/src/lib/auth/TODO
+++ /dev/null
@@ -1,2 +0,0 @@
-- change filenames so we don't have everything starting with "data_source_"?
-- store rdata in the database as binary blobs instead of text
diff --git a/src/lib/datasrc/Makefile.am b/src/lib/datasrc/Makefile.am
new file mode 100644
index 0000000000..2c00263df5
--- /dev/null
+++ b/src/lib/datasrc/Makefile.am
@@ -0,0 +1,13 @@
+SUBDIRS = . tests
+
+AM_CPPFLAGS = -I$(top_srcdir)/src/lib -I$(top_builddir)/src/lib
+AM_CPPFLAGS += -I$(top_srcdir)/src/lib/dns -I$(top_builddir)/src/lib/dns
+AM_CPPFLAGS += $(SQLITE_CFLAGS)
+
+CLEANFILES = *.gcno *.gcda
+
+lib_LTLIBRARIES = libdatasrc.la
+libdatasrc_la_SOURCES = data_source.h data_source.cc
+libdatasrc_la_SOURCES += static_datasrc.h static_datasrc.cc
+libdatasrc_la_SOURCES += sqlite3_datasrc.h sqlite3_datasrc.cc
+libdatasrc_la_SOURCES += query.h query.cc
diff --git a/src/lib/datasrc/TODO b/src/lib/datasrc/TODO
new file mode 100644
index 0000000000..5b875813e7
--- /dev/null
+++ b/src/lib/datasrc/TODO
@@ -0,0 +1 @@
+- store rdata in the database as binary blobs instead of text
diff --git a/src/lib/auth/data_source.cc b/src/lib/datasrc/data_source.cc
similarity index 99%
rename from src/lib/auth/data_source.cc
rename to src/lib/datasrc/data_source.cc
index b1b1087aeb..61a11b62f8 100644
--- a/src/lib/auth/data_source.cc
+++ b/src/lib/datasrc/data_source.cc
@@ -49,7 +49,7 @@ using namespace isc::dns;
 using namespace isc::dns::rdata;
 
 namespace isc {
-namespace auth {
+namespace datasrc {
 
 typedef boost::shared_ptr<const Nsec3Param> ConstNsec3ParamPtr;
 
diff --git a/src/lib/auth/data_source.h b/src/lib/datasrc/data_source.h
similarity index 99%
rename from src/lib/auth/data_source.h
rename to src/lib/datasrc/data_source.h
index afa3fee172..13944bad34 100644
--- a/src/lib/auth/data_source.h
+++ b/src/lib/datasrc/data_source.h
@@ -38,7 +38,7 @@ class RRset;
 class RRsetList;
 }
 
-namespace auth {
+namespace datasrc {
 
 class NameMatch;
 class Query;
diff --git a/src/lib/auth/query.cc b/src/lib/datasrc/query.cc
similarity index 99%
rename from src/lib/auth/query.cc
rename to src/lib/datasrc/query.cc
index 6da8290190..8b3089c0f0 100644
--- a/src/lib/auth/query.cc
+++ b/src/lib/datasrc/query.cc
@@ -26,7 +26,7 @@
 using namespace isc::dns;
 
 namespace isc {
-namespace auth {
+namespace datasrc {
 
 QueryTask::QueryTask(const isc::dns::Name& n, const isc::dns::RRClass& c,
                      const isc::dns::RRType& t, const isc::dns::Section& sect) :
diff --git a/src/lib/auth/query.h b/src/lib/datasrc/query.h
similarity index 99%
rename from src/lib/auth/query.h
rename to src/lib/datasrc/query.h
index 4d2b9841ad..e2624ee8eb 100644
--- a/src/lib/auth/query.h
+++ b/src/lib/datasrc/query.h
@@ -28,7 +28,7 @@
 
 namespace isc {
 
-namespace auth {
+namespace datasrc {
 
 // An individual task to be carried out by the query logic
 class QueryTask {
diff --git a/src/lib/auth/sqlite3_datasrc.cc b/src/lib/datasrc/sqlite3_datasrc.cc
similarity index 99%
rename from src/lib/auth/sqlite3_datasrc.cc
rename to src/lib/datasrc/sqlite3_datasrc.cc
index 17cc59e741..4b68590743 100644
--- a/src/lib/auth/sqlite3_datasrc.cc
+++ b/src/lib/datasrc/sqlite3_datasrc.cc
@@ -32,7 +32,7 @@ using namespace isc::dns;
 using namespace isc::dns::rdata;
 
 namespace isc {
-namespace auth {
+namespace datasrc {
 
 struct Sqlite3Parameters {
     Sqlite3Parameters() :  db_(NULL), version_(-1),
diff --git a/src/lib/auth/sqlite3_datasrc.h b/src/lib/datasrc/sqlite3_datasrc.h
similarity index 99%
rename from src/lib/auth/sqlite3_datasrc.h
rename to src/lib/datasrc/sqlite3_datasrc.h
index 1790eacb58..d5ba1d3461 100644
--- a/src/lib/auth/sqlite3_datasrc.h
+++ b/src/lib/datasrc/sqlite3_datasrc.h
@@ -32,7 +32,7 @@ class RRType;
 class RRsetList;
 }
 
-namespace auth {
+namespace datasrc {
 
 class Query;
 struct Sqlite3Parameters;
diff --git a/src/lib/auth/static_datasrc.cc b/src/lib/datasrc/static_datasrc.cc
similarity index 99%
rename from src/lib/auth/static_datasrc.cc
rename to src/lib/datasrc/static_datasrc.cc
index 0a5166f5bf..758e097381 100644
--- a/src/lib/auth/static_datasrc.cc
+++ b/src/lib/datasrc/static_datasrc.cc
@@ -34,7 +34,7 @@ using namespace isc::dns;
 using namespace isc::dns::rdata;
 
 namespace isc {
-namespace auth {
+namespace datasrc {
 
 // This class stores the "static" data for the built-in static data source.
 // Since it's static, it could be literally static, i.e, defined as static
diff --git a/src/lib/auth/static_datasrc.h b/src/lib/datasrc/static_datasrc.h
similarity index 99%
rename from src/lib/auth/static_datasrc.h
rename to src/lib/datasrc/static_datasrc.h
index 1897cb0c81..3428279181 100644
--- a/src/lib/auth/static_datasrc.h
+++ b/src/lib/datasrc/static_datasrc.h
@@ -37,7 +37,7 @@ class RRType;
 class RRsetList;
 }
 
-namespace auth {
+namespace datasrc {
 
 class Query;
 class NameMatch;
diff --git a/src/lib/auth/tests/Makefile.am b/src/lib/datasrc/tests/Makefile.am
similarity index 96%
rename from src/lib/auth/tests/Makefile.am
rename to src/lib/datasrc/tests/Makefile.am
index 37a1e87c37..62aa475ec6 100644
--- a/src/lib/auth/tests/Makefile.am
+++ b/src/lib/datasrc/tests/Makefile.am
@@ -19,7 +19,7 @@ run_unittests_CPPFLAGS = $(AM_CPPFLAGS) $(GTEST_INCLUDES)
 run_unittests_LDFLAGS = $(AM_LDFLAGS) $(GTEST_LDFLAGS)
 run_unittests_LDADD = $(GTEST_LDADD)
 run_unittests_LDADD += $(SQLITE_LIBS)
-run_unittests_LDADD += $(top_builddir)/src/lib/auth/.libs/libauth.a 
+run_unittests_LDADD += $(top_builddir)/src/lib/datasrc/.libs/libdatasrc.a 
 run_unittests_LDADD += $(top_builddir)/src/lib/dns/.libs/libdns.a 
 run_unittests_LDADD += $(top_builddir)/src/lib/cc/libcc.a 
 run_unittests_LDADD += $(top_builddir)/src/lib/exceptions/.libs/libexceptions.a
diff --git a/src/lib/auth/tests/datasrc_unittest.cc b/src/lib/datasrc/tests/datasrc_unittest.cc
similarity index 99%
rename from src/lib/auth/tests/datasrc_unittest.cc
rename to src/lib/datasrc/tests/datasrc_unittest.cc
index 9c9e32afad..bee83a18e1 100644
--- a/src/lib/auth/tests/datasrc_unittest.cc
+++ b/src/lib/datasrc/tests/datasrc_unittest.cc
@@ -34,9 +34,9 @@
 
 #include <cc/data.h>
 
-#include <auth/query.h>
-#include <auth/sqlite3_datasrc.h>
-#include <auth/static_datasrc.h>
+#include <datasrc/query.h>
+#include <datasrc/sqlite3_datasrc.h>
+#include <datasrc/static_datasrc.h>
 
 #include <dns/tests/unittest_util.h>
 #include "test_datasrc.h"
@@ -45,7 +45,7 @@ using isc::UnitTestUtil;
 using namespace std;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
-using namespace isc::auth;
+using namespace isc::datasrc;
 using namespace isc::data;
 
 namespace {
diff --git a/src/lib/auth/tests/query_unittest.cc b/src/lib/datasrc/tests/query_unittest.cc
similarity index 96%
rename from src/lib/auth/tests/query_unittest.cc
rename to src/lib/datasrc/tests/query_unittest.cc
index 2aa8b40910..d5debcd04f 100644
--- a/src/lib/auth/tests/query_unittest.cc
+++ b/src/lib/datasrc/tests/query_unittest.cc
@@ -20,12 +20,12 @@
 #include <dns/rrtype.h>
 #include <dns/rrclass.h>
 
-#include <auth/query.h>
+#include <datasrc/query.h>
 
 namespace {
 
 using namespace isc::dns;
-using namespace isc::auth;
+using namespace isc::datasrc;
 
 
 class QueryTest : public ::testing::Test {
diff --git a/src/lib/auth/tests/run_unittests.cc b/src/lib/datasrc/tests/run_unittests.cc
similarity index 100%
rename from src/lib/auth/tests/run_unittests.cc
rename to src/lib/datasrc/tests/run_unittests.cc
diff --git a/src/lib/auth/tests/sqlite3_unittest.cc b/src/lib/datasrc/tests/sqlite3_unittest.cc
similarity index 99%
rename from src/lib/auth/tests/sqlite3_unittest.cc
rename to src/lib/datasrc/tests/sqlite3_unittest.cc
index bb7fea2dec..1e3f1f83d2 100644
--- a/src/lib/auth/tests/sqlite3_unittest.cc
+++ b/src/lib/datasrc/tests/sqlite3_unittest.cc
@@ -32,14 +32,14 @@
 #include <dns/rrsetlist.h>
 #include <cc/data.h>
 
-#include <auth/query.h>
-#include <auth/data_source.h>
-#include <auth/sqlite3_datasrc.h>
+#include <datasrc/query.h>
+#include <datasrc/data_source.h>
+#include <datasrc/sqlite3_datasrc.h>
 
 using namespace std;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
-using namespace isc::auth;
+using namespace isc::datasrc;
 using namespace isc::data;
 
 namespace {
diff --git a/src/lib/auth/tests/static_unittest.cc b/src/lib/datasrc/tests/static_unittest.cc
similarity index 99%
rename from src/lib/auth/tests/static_unittest.cc
rename to src/lib/datasrc/tests/static_unittest.cc
index 219f98e92f..86bb99ccbe 100644
--- a/src/lib/auth/tests/static_unittest.cc
+++ b/src/lib/datasrc/tests/static_unittest.cc
@@ -31,14 +31,14 @@
 #include <dns/rrsetlist.h>
 #include <cc/data.h>
 
-#include <auth/query.h>
-#include <auth/data_source.h>
-#include <auth/static_datasrc.h>
+#include <datasrc/query.h>
+#include <datasrc/data_source.h>
+#include <datasrc/static_datasrc.h>
 
 using namespace std;
 using namespace isc::dns;
 using namespace isc::dns::rdata;
-using namespace isc::auth;
+using namespace isc::datasrc;
 
 namespace {
 class StaticDataSourceTest : public ::testing::Test {
diff --git a/src/lib/auth/tests/test_datasrc.cc b/src/lib/datasrc/tests/test_datasrc.cc
similarity index 99%
rename from src/lib/auth/tests/test_datasrc.cc
rename to src/lib/datasrc/tests/test_datasrc.cc
index 5cca51500f..39cb40bd54 100644
--- a/src/lib/auth/tests/test_datasrc.cc
+++ b/src/lib/datasrc/tests/test_datasrc.cc
@@ -21,7 +21,7 @@
 #include <dns/tests/unittest_util.h>
 #include "test_datasrc.h"
 
-#include <auth/data_source.h>
+#include <datasrc/data_source.h>
 
 #include <dns/buffer.h>
 #include <dns/messagerenderer.h>
@@ -42,7 +42,7 @@ using namespace isc::dns;
 using namespace isc::dns::rdata;
 
 namespace isc {
-namespace auth {
+namespace datasrc {
 
 namespace {
 const Name example("example.com");
diff --git a/src/lib/auth/tests/test_datasrc.h b/src/lib/datasrc/tests/test_datasrc.h
similarity index 98%
rename from src/lib/auth/tests/test_datasrc.h
rename to src/lib/datasrc/tests/test_datasrc.h
index 9618f4782c..b625d9ee53 100644
--- a/src/lib/auth/tests/test_datasrc.h
+++ b/src/lib/datasrc/tests/test_datasrc.h
@@ -19,7 +19,7 @@
 
 #include <gtest/gtest.h>
 
-#include <auth/data_source.h>
+#include <datasrc/data_source.h>
 
 namespace isc {
 
@@ -30,7 +30,7 @@ class RRType;
 class RRsetList;
 }
 
-namespace auth {
+namespace datasrc {
 class Query;
 
 class TestDataSrc : public DataSrc {
diff --git a/src/lib/auth/tests/testdata/brokendb.sqlite3 b/src/lib/datasrc/tests/testdata/brokendb.sqlite3
similarity index 100%
rename from src/lib/auth/tests/testdata/brokendb.sqlite3
rename to src/lib/datasrc/tests/testdata/brokendb.sqlite3
diff --git a/src/lib/auth/tests/testdata/example.com.signed b/src/lib/datasrc/tests/testdata/example.com.signed
similarity index 100%
rename from src/lib/auth/tests/testdata/example.com.signed
rename to src/lib/datasrc/tests/testdata/example.com.signed
diff --git a/src/lib/auth/tests/testdata/example.org b/src/lib/datasrc/tests/testdata/example.org
similarity index 100%
rename from src/lib/auth/tests/testdata/example.org
rename to src/lib/datasrc/tests/testdata/example.org
diff --git a/src/lib/auth/tests/testdata/example.org.sqlite3 b/src/lib/datasrc/tests/testdata/example.org.sqlite3
similarity index 100%
rename from src/lib/auth/tests/testdata/example.org.sqlite3
rename to src/lib/datasrc/tests/testdata/example.org.sqlite3
diff --git a/src/lib/auth/tests/testdata/example2.com b/src/lib/datasrc/tests/testdata/example2.com
similarity index 100%
rename from src/lib/auth/tests/testdata/example2.com
rename to src/lib/datasrc/tests/testdata/example2.com
diff --git a/src/lib/auth/tests/testdata/example2.com.sqlite3 b/src/lib/datasrc/tests/testdata/example2.com.sqlite3
similarity index 100%
rename from src/lib/auth/tests/testdata/example2.com.sqlite3
rename to src/lib/datasrc/tests/testdata/example2.com.sqlite3
diff --git a/src/lib/auth/tests/testdata/mkbrokendb.c b/src/lib/datasrc/tests/testdata/mkbrokendb.c
similarity index 100%
rename from src/lib/auth/tests/testdata/mkbrokendb.c
rename to src/lib/datasrc/tests/testdata/mkbrokendb.c
diff --git a/src/lib/auth/tests/testdata/q_cname b/src/lib/datasrc/tests/testdata/q_cname
similarity index 100%
rename from src/lib/auth/tests/testdata/q_cname
rename to src/lib/datasrc/tests/testdata/q_cname
diff --git a/src/lib/auth/tests/testdata/q_cname_ext b/src/lib/datasrc/tests/testdata/q_cname_ext
similarity index 100%
rename from src/lib/auth/tests/testdata/q_cname_ext
rename to src/lib/datasrc/tests/testdata/q_cname_ext
diff --git a/src/lib/auth/tests/testdata/q_cname_int b/src/lib/datasrc/tests/testdata/q_cname_int
similarity index 100%
rename from src/lib/auth/tests/testdata/q_cname_int
rename to src/lib/datasrc/tests/testdata/q_cname_int
diff --git a/src/lib/auth/tests/testdata/q_dname b/src/lib/datasrc/tests/testdata/q_dname
similarity index 100%
rename from src/lib/auth/tests/testdata/q_dname
rename to src/lib/datasrc/tests/testdata/q_dname
diff --git a/src/lib/auth/tests/testdata/q_example_ns b/src/lib/datasrc/tests/testdata/q_example_ns
similarity index 100%
rename from src/lib/auth/tests/testdata/q_example_ns
rename to src/lib/datasrc/tests/testdata/q_example_ns
diff --git a/src/lib/auth/tests/testdata/q_example_ptr b/src/lib/datasrc/tests/testdata/q_example_ptr
similarity index 100%
rename from src/lib/auth/tests/testdata/q_example_ptr
rename to src/lib/datasrc/tests/testdata/q_example_ptr
diff --git a/src/lib/auth/tests/testdata/q_glork b/src/lib/datasrc/tests/testdata/q_glork
similarity index 100%
rename from src/lib/auth/tests/testdata/q_glork
rename to src/lib/datasrc/tests/testdata/q_glork
diff --git a/src/lib/auth/tests/testdata/q_spork b/src/lib/datasrc/tests/testdata/q_spork
similarity index 100%
rename from src/lib/auth/tests/testdata/q_spork
rename to src/lib/datasrc/tests/testdata/q_spork
diff --git a/src/lib/auth/tests/testdata/q_sql1 b/src/lib/datasrc/tests/testdata/q_sql1
similarity index 100%
rename from src/lib/auth/tests/testdata/q_sql1
rename to src/lib/datasrc/tests/testdata/q_sql1
diff --git a/src/lib/auth/tests/testdata/q_subzone b/src/lib/datasrc/tests/testdata/q_subzone
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone
rename to src/lib/datasrc/tests/testdata/q_subzone
diff --git a/src/lib/auth/tests/testdata/q_subzone_any b/src/lib/datasrc/tests/testdata/q_subzone_any
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone_any
rename to src/lib/datasrc/tests/testdata/q_subzone_any
diff --git a/src/lib/auth/tests/testdata/q_subzone_dname b/src/lib/datasrc/tests/testdata/q_subzone_dname
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone_dname
rename to src/lib/datasrc/tests/testdata/q_subzone_dname
diff --git a/src/lib/auth/tests/testdata/q_subzone_ds b/src/lib/datasrc/tests/testdata/q_subzone_ds
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone_ds
rename to src/lib/datasrc/tests/testdata/q_subzone_ds
diff --git a/src/lib/auth/tests/testdata/q_subzone_ns b/src/lib/datasrc/tests/testdata/q_subzone_ns
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone_ns
rename to src/lib/datasrc/tests/testdata/q_subzone_ns
diff --git a/src/lib/auth/tests/testdata/q_subzone_nsec b/src/lib/datasrc/tests/testdata/q_subzone_nsec
similarity index 100%
rename from src/lib/auth/tests/testdata/q_subzone_nsec
rename to src/lib/datasrc/tests/testdata/q_subzone_nsec
diff --git a/src/lib/auth/tests/testdata/q_wild2_a b/src/lib/datasrc/tests/testdata/q_wild2_a
similarity index 100%
rename from src/lib/auth/tests/testdata/q_wild2_a
rename to src/lib/datasrc/tests/testdata/q_wild2_a
diff --git a/src/lib/auth/tests/testdata/q_wild2_aaaa b/src/lib/datasrc/tests/testdata/q_wild2_aaaa
similarity index 100%
rename from src/lib/auth/tests/testdata/q_wild2_aaaa
rename to src/lib/datasrc/tests/testdata/q_wild2_aaaa
diff --git a/src/lib/auth/tests/testdata/q_wild3_a b/src/lib/datasrc/tests/testdata/q_wild3_a
similarity index 100%
rename from src/lib/auth/tests/testdata/q_wild3_a
rename to src/lib/datasrc/tests/testdata/q_wild3_a
diff --git a/src/lib/auth/tests/testdata/q_wild_a b/src/lib/datasrc/tests/testdata/q_wild_a
similarity index 100%
rename from src/lib/auth/tests/testdata/q_wild_a
rename to src/lib/datasrc/tests/testdata/q_wild_a
diff --git a/src/lib/auth/tests/testdata/q_wild_aaaa b/src/lib/datasrc/tests/testdata/q_wild_aaaa
similarity index 100%
rename from src/lib/auth/tests/testdata/q_wild_aaaa
rename to src/lib/datasrc/tests/testdata/q_wild_aaaa
diff --git a/src/lib/auth/tests/testdata/root.zone b/src/lib/datasrc/tests/testdata/root.zone
similarity index 100%
rename from src/lib/auth/tests/testdata/root.zone
rename to src/lib/datasrc/tests/testdata/root.zone
diff --git a/src/lib/auth/tests/testdata/sql1.example.com.signed b/src/lib/datasrc/tests/testdata/sql1.example.com.signed
similarity index 100%
rename from src/lib/auth/tests/testdata/sql1.example.com.signed
rename to src/lib/datasrc/tests/testdata/sql1.example.com.signed
diff --git a/src/lib/auth/tests/testdata/sql2.example.com.signed b/src/lib/datasrc/tests/testdata/sql2.example.com.signed
similarity index 100%
rename from src/lib/auth/tests/testdata/sql2.example.com.signed
rename to src/lib/datasrc/tests/testdata/sql2.example.com.signed
diff --git a/src/lib/auth/tests/testdata/test-root.sqlite3 b/src/lib/datasrc/tests/testdata/test-root.sqlite3
similarity index 100%
rename from src/lib/auth/tests/testdata/test-root.sqlite3
rename to src/lib/datasrc/tests/testdata/test-root.sqlite3
diff --git a/src/lib/auth/tests/testdata/test.sqlite3 b/src/lib/datasrc/tests/testdata/test.sqlite3
similarity index 100%
rename from src/lib/auth/tests/testdata/test.sqlite3
rename to src/lib/datasrc/tests/testdata/test.sqlite3
diff --git a/src/lib/python/isc/Makefile.am b/src/lib/python/isc/Makefile.am
index 496819c7b0..4c0ccfe5a9 100644
--- a/src/lib/python/isc/Makefile.am
+++ b/src/lib/python/isc/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = auth cc config # Util
+SUBDIRS = datasrc cc config # Util
 
 python_PYTHON = __init__.py
 
diff --git a/src/lib/python/isc/__init__.py b/src/lib/python/isc/__init__.py
index b290f1302f..44dd29d088 100644
--- a/src/lib/python/isc/__init__.py
+++ b/src/lib/python/isc/__init__.py
@@ -1,3 +1,3 @@
-import isc.auth
+import isc.datasrc
 import isc.cc
 import isc.config
diff --git a/src/lib/python/isc/auth/__init__.py b/src/lib/python/isc/auth/__init__.py
deleted file mode 100644
index 91d96fd746..0000000000
--- a/src/lib/python/isc/auth/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-from isc.auth.master import *
-from isc.auth.sqlite3_ds import *
diff --git a/src/lib/python/isc/auth/Makefile.am b/src/lib/python/isc/datasrc/Makefile.am
similarity index 58%
rename from src/lib/python/isc/auth/Makefile.am
rename to src/lib/python/isc/datasrc/Makefile.am
index 1c40b96a7d..16be6f3ec9 100644
--- a/src/lib/python/isc/auth/Makefile.am
+++ b/src/lib/python/isc/datasrc/Makefile.am
@@ -1,3 +1,3 @@
 python_PYTHON = __init__.py master.py sqlite3_ds.py
 
-pythondir = $(pyexecdir)/isc/auth
+pythondir = $(pyexecdir)/isc/datasrc
diff --git a/src/lib/python/isc/datasrc/__init__.py b/src/lib/python/isc/datasrc/__init__.py
new file mode 100644
index 0000000000..0e1e481080
--- /dev/null
+++ b/src/lib/python/isc/datasrc/__init__.py
@@ -0,0 +1,2 @@
+from isc.datasrc.master import *
+from isc.datasrc.sqlite3_ds import *
diff --git a/src/lib/python/isc/auth/master.py b/src/lib/python/isc/datasrc/master.py
similarity index 100%
rename from src/lib/python/isc/auth/master.py
rename to src/lib/python/isc/datasrc/master.py
diff --git a/src/lib/python/isc/auth/sqlite3_ds.py b/src/lib/python/isc/datasrc/sqlite3_ds.py
similarity index 100%
rename from src/lib/python/isc/auth/sqlite3_ds.py
rename to src/lib/python/isc/datasrc/sqlite3_ds.py