diff --git a/server/lib/python/cartodb_services/cartodb_services/refactor/storage/null_config.py b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/null_config.py
new file mode 100644
index 0000000..88e0cad
--- /dev/null
+++ b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/null_config.py
@@ -0,0 +1,6 @@
+from interfaces import ConfigStorageInterface
+
+class NullConfigStorage(ConfigStorageInterface):
+
+    def get(self, key):
+        return None
diff --git a/server/lib/python/cartodb_services/cartodb_services/refactor/storage/server_config.py b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/server_config.py
index e02259b..eb54bac 100644
--- a/server/lib/python/cartodb_services/cartodb_services/refactor/storage/server_config.py
+++ b/server/lib/python/cartodb_services/cartodb_services/refactor/storage/server_config.py
@@ -1,6 +1,7 @@
 import json
 import cartodb_services
 from interfaces import ConfigStorageInterface
+from null_config import NullConfigStorage
 
 class InDbServerConfigStorage(ConfigStorageInterface):
 
@@ -13,10 +14,6 @@ class InDbServerConfigStorage(ConfigStorageInterface):
         else:
             return None
 
-class NullConfigStorage(ConfigStorageInterface):
-
-    def get(self, key):
-        return None
 
 # TODO move out of this file. In general this is config but either user or org config
 class RedisConfigStorage(ConfigStorageInterface):