diff --git a/state/__init__.py b/core/__init__.py
similarity index 100%
rename from state/__init__.py
rename to core/__init__.py
diff --git a/state/test/__init__.py b/core/manager.py
similarity index 100%
rename from state/test/__init__.py
rename to core/manager.py
diff --git a/state/test/fixtures/__init__.py b/services/__init__.py
similarity index 100%
rename from state/test/fixtures/__init__.py
rename to services/__init__.py
diff --git a/services/bottom/__init__.py b/services/bottom/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/state/base.py b/services/bottom/base.py
similarity index 100%
rename from state/base.py
rename to services/bottom/base.py
diff --git a/state/devstate.py b/services/bottom/devstate.py
similarity index 97%
rename from state/devstate.py
rename to services/bottom/devstate.py
index 798d8d9..65d4357 100644
--- a/state/devstate.py
+++ b/services/bottom/devstate.py
@@ -1,4 +1,4 @@
-from state.pystate import PyState
+from services.bottom.pystate import PyState
 
 
 class DevState(PyState):
diff --git a/state/pystate.py b/services/bottom/pystate.py
similarity index 99%
rename from state/pystate.py
rename to services/bottom/pystate.py
index b88a358..8f306ec 100644
--- a/state/pystate.py
+++ b/services/bottom/pystate.py
@@ -1,6 +1,6 @@
 from typing import Any, List, Tuple, Optional
 
-from state.base import State, Node, Edge, Element
+from services.bottom.base import State, Node, Edge, Element
 
 
 class PyState(State):
diff --git a/services/bottom/test/__init__.py b/services/bottom/test/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/state/test/conftest.py b/services/bottom/test/conftest.py
similarity index 100%
rename from state/test/conftest.py
rename to services/bottom/test/conftest.py
diff --git a/services/bottom/test/fixtures/__init__.py b/services/bottom/test/fixtures/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/state/test/fixtures/state.py b/services/bottom/test/fixtures/state.py
similarity index 90%
rename from state/test/fixtures/state.py
rename to services/bottom/test/fixtures/state.py
index ab7eb87..6dcb16e 100644
--- a/state/test/fixtures/state.py
+++ b/services/bottom/test/fixtures/state.py
@@ -1,5 +1,5 @@
 import pytest
-from state.pystate import PyState
+from services.bottom.pystate import PyState
 # from state.rdfstate import RDFState
 # from state.neo4jstate import Neo4jState
 
diff --git a/state/test/test_create_dict.py b/services/bottom/test/test_create_dict.py
similarity index 100%
rename from state/test/test_create_dict.py
rename to services/bottom/test/test_create_dict.py
diff --git a/state/test/test_create_edge.py b/services/bottom/test/test_create_edge.py
similarity index 100%
rename from state/test/test_create_edge.py
rename to services/bottom/test/test_create_edge.py
diff --git a/state/test/test_create_node.py b/services/bottom/test/test_create_node.py
similarity index 100%
rename from state/test/test_create_node.py
rename to services/bottom/test/test_create_node.py
diff --git a/state/test/test_create_nodevalue.py b/services/bottom/test/test_create_nodevalue.py
similarity index 100%
rename from state/test/test_create_nodevalue.py
rename to services/bottom/test/test_create_nodevalue.py
diff --git a/state/test/test_delete_edge.py b/services/bottom/test/test_delete_edge.py
similarity index 100%
rename from state/test/test_delete_edge.py
rename to services/bottom/test/test_delete_edge.py
diff --git a/state/test/test_delete_node.py b/services/bottom/test/test_delete_node.py
similarity index 100%
rename from state/test/test_delete_node.py
rename to services/bottom/test/test_delete_node.py
diff --git a/state/test/test_read_dict.py b/services/bottom/test/test_read_dict.py
similarity index 100%
rename from state/test/test_read_dict.py
rename to services/bottom/test/test_read_dict.py
diff --git a/state/test/test_read_dict_edge.py b/services/bottom/test/test_read_dict_edge.py
similarity index 100%
rename from state/test/test_read_dict_edge.py
rename to services/bottom/test/test_read_dict_edge.py
diff --git a/state/test/test_read_dict_keys.py b/services/bottom/test/test_read_dict_keys.py
similarity index 100%
rename from state/test/test_read_dict_keys.py
rename to services/bottom/test/test_read_dict_keys.py
diff --git a/state/test/test_read_dict_node.py b/services/bottom/test/test_read_dict_node.py
similarity index 100%
rename from state/test/test_read_dict_node.py
rename to services/bottom/test/test_read_dict_node.py
diff --git a/state/test/test_read_edge.py b/services/bottom/test/test_read_edge.py
similarity index 100%
rename from state/test/test_read_edge.py
rename to services/bottom/test/test_read_edge.py
diff --git a/state/test/test_read_incoming.py b/services/bottom/test/test_read_incoming.py
similarity index 100%
rename from state/test/test_read_incoming.py
rename to services/bottom/test/test_read_incoming.py
diff --git a/state/test/test_read_outgoing.py b/services/bottom/test/test_read_outgoing.py
similarity index 100%
rename from state/test/test_read_outgoing.py
rename to services/bottom/test/test_read_outgoing.py
diff --git a/state/test/test_read_reverse_dict.py b/services/bottom/test/test_read_reverse_dict.py
similarity index 100%
rename from state/test/test_read_reverse_dict.py
rename to services/bottom/test/test_read_reverse_dict.py
diff --git a/state/test/test_read_value.py b/services/bottom/test/test_read_value.py
similarity index 100%
rename from state/test/test_read_value.py
rename to services/bottom/test/test_read_value.py