diff --git a/helm_drydock/ingester/ingester.py b/helm_drydock/ingester/ingester.py
deleted file mode 100644
index ffdf2761..00000000
--- a/helm_drydock/ingester/ingester.py
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 2017 AT&T Intellectual Property.  All other rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ingester - Ingest host topologies to define site design and
-# 			persist design to helm-drydock's statemgmt service
-
-import logging
-import yaml
-
-class Ingester(object):
-
-    registered_plugins = {}
-
-    def __init__(self):
-        logging.basicConfig(format="%(asctime)-15s [%(levelname)] %(module)s %(process)d %(message)s")
-        self.log = logging.Logger("ingester")
-
-    """
-      enable_plugins
-
-      params: plugins - A list of class objects denoting the ingester plugins to be enabled
-
-      Enable plugins that can be used for ingest_data calls. Each plugin should use
-      helm_drydock.ingester.plugins.IngesterPlugin as its base class. As long as one
-      enabled plugin successfully initializes, the call is considered successful. Otherwise
-      it will throw an exception
-    """
-    def enable_plugins(self, plugins=[]):
-        if len(plugin) == 0:
-            self.log.error("Cannot have an empty plugin list.")
-
-        for plugin in plugins:
-            try:
-                new_plugin = plugin()
-                plugin_name = new_plugin.get_name()
-                registered_plugins[plugin_name] = new_plugin
-            except:
-                self.log.error("Could not enable plugin %s" % (plugin.__name__))
-
-        if len(registered_plugins) == 0:
-            self.log.error("Could not enable at least one plugin")
-            raise Exception("Could not enable at least one plugin")
-
-    """
-      ingest_data
-
-      params: plugin_name - Which plugin should be used for ingestion
-      params: params - A map of parameters that will be passed to the plugin's ingest_data method
-
-      Execute a data ingestion using the named plugin (assuming it is enabled) 
-    """
-    def ingest_data(self, plugin_name, params={}):
-        if plugin_name in registered_plugins:
-            design_data = registered_plugins[plugin_name].ingest_data(params)
-            # Need to persist data here, but we don't yet have the statemgmt service working
-            yaml.dump(design_data)
-        else
-            self.log.error("Could not find plugin %s to ingest data." % (plugin_name))
-            raise LookupError("Could not find plugin %s" % plugin_name)
-
-
diff --git a/setup.py b/setup.py
index 5107af4e..caa39b96 100644
--- a/setup.py
+++ b/setup.py
@@ -42,7 +42,8 @@ setup(name='helm_drydock',
       packages=['helm_drydock',
                 'helm_drydock.model',
                 'helm_drydock.ingester',
-                'helm_drydock.ingester.plugins'],
+                'helm_drydock.ingester.plugins',
+                'helm_drydock.statemgmt'],
       install_requires=[
         'PyYAML',
         'oauth',