diff --git a/chaind/adapters/new.py b/chaind/adapters/fs.py
similarity index 100%
rename from chaind/adapters/new.py
rename to chaind/adapters/fs.py
diff --git a/chaind/db/migrations/default/README b/chaind/old/db/migrations/default/README
similarity index 100%
rename from chaind/db/migrations/default/README
rename to chaind/old/db/migrations/default/README
diff --git a/chaind/db/migrations/default/alembic.ini b/chaind/old/db/migrations/default/alembic.ini
similarity index 100%
rename from chaind/db/migrations/default/alembic.ini
rename to chaind/old/db/migrations/default/alembic.ini
diff --git a/chaind/db/migrations/default/env.py b/chaind/old/db/migrations/default/env.py
similarity index 100%
rename from chaind/db/migrations/default/env.py
rename to chaind/old/db/migrations/default/env.py
diff --git a/chaind/db/migrations/default/script.py.mako b/chaind/old/db/migrations/default/script.py.mako
similarity index 100%
rename from chaind/db/migrations/default/script.py.mako
rename to chaind/old/db/migrations/default/script.py.mako
diff --git a/chaind/db/migrations/default/versions/74e890aec7b0_session_tx_index.py b/chaind/old/db/migrations/default/versions/74e890aec7b0_session_tx_index.py
similarity index 100%
rename from chaind/db/migrations/default/versions/74e890aec7b0_session_tx_index.py
rename to chaind/old/db/migrations/default/versions/74e890aec7b0_session_tx_index.py
diff --git a/chaind/db/migrations/default/versions/7ac591b16c68_chainqueue.py b/chaind/old/db/migrations/default/versions/7ac591b16c68_chainqueue.py
similarity index 100%
rename from chaind/db/migrations/default/versions/7ac591b16c68_chainqueue.py
rename to chaind/old/db/migrations/default/versions/7ac591b16c68_chainqueue.py
diff --git a/chaind/db/migrations/default/versions/b139fca16787_chainsyncer.py b/chaind/old/db/migrations/default/versions/b139fca16787_chainsyncer.py
similarity index 100%
rename from chaind/db/migrations/default/versions/b139fca16787_chainsyncer.py
rename to chaind/old/db/migrations/default/versions/b139fca16787_chainsyncer.py
diff --git a/setup.cfg b/setup.cfg
index f8adeed..41ca15d 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -20,17 +20,17 @@ classifiers =
 #	Topic :: Blockchain :: EVM
 license = GPL3
 licence_files =
-	LICENSE.txt
+	LICENSE
 
 [options]
 python_requires = >= 3.6
 include_package_data = True
 packages = 
 	chaind
-	chaind.sql
-	chaind.runnable
+#	chaind.sql
+#	chaind.runnable
 	chainqueue.adapters
 
-[options.entry_points]
-console_scripts =
-	chaind-list = chaind.runnable.list:main
+#[options.entry_points]
+#console_scripts =
+#	chaind-list = chaind.runnable.list:main
diff --git a/tests/test_fs.py b/tests/test_fs.py
index 86ca251..39730fa 100644
--- a/tests/test_fs.py
+++ b/tests/test_fs.py
@@ -62,7 +62,8 @@ class TestChaindFs(unittest.TestCase):
         self.chain_spec = ChainSpec('foo', 'bar', 42, 'baz')
         self.path = tempfile.mkdtemp()
         self.dispatcher = MockDispatcher()
-        self.adapter = ChaindFsAdapter(self.chain_spec, self.path, MockCacheAdapter().deserialize, self.dispatcher)
+        deserializer = MockCacheAdapter().deserialize
+        self.adapter = ChaindFsAdapter(self.chain_spec, self.path, deserializer, self.dispatcher)
 
 
     def tearDown(self):