diff --git a/entityshape/api_v1_blueprint.py b/entityshape/api_v1/api_v1_blueprint.py
similarity index 94%
rename from entityshape/api_v1_blueprint.py
rename to entityshape/api_v1/api_v1_blueprint.py
index e9f1fac..ca9e2ca 100644
--- a/entityshape/api_v1_blueprint.py
+++ b/entityshape/api_v1/api_v1_blueprint.py
@@ -1,7 +1,7 @@
 from flask import Blueprint, request, json, Response
 
-from entityshape.shape import Shape
-from entityshape.compareshape import CompareShape
+from entityshape.api_v1.shape import Shape
+from entityshape.api_v1.compareshape import CompareShape
 
 api_v1 = Blueprint('api_v1', __name__,)
 
diff --git a/entityshape/compareshape.py b/entityshape/api_v1/compareshape.py
similarity index 100%
rename from entityshape/compareshape.py
rename to entityshape/api_v1/compareshape.py
diff --git a/entityshape/shape.py b/entityshape/api_v1/shape.py
similarity index 100%
rename from entityshape/shape.py
rename to entityshape/api_v1/shape.py
diff --git a/entityshape/api_v2_blueprint.py b/entityshape/api_v2/api_v2_blueprint.py
similarity index 94%
rename from entityshape/api_v2_blueprint.py
rename to entityshape/api_v2/api_v2_blueprint.py
index 41ec5e4..b6384da 100644
--- a/entityshape/api_v2_blueprint.py
+++ b/entityshape/api_v2/api_v2_blueprint.py
@@ -1,7 +1,7 @@
 from flask import Blueprint, request, json, Response
 
-from entityshape.getjsonld import JSONLDShape
-from entityshape.comparejsonld import CompareJSONLD
+from entityshape.api_v2.getjsonld import JSONLDShape
+from entityshape.api_v2.comparejsonld import CompareJSONLD
 
 
 api_v2 = Blueprint('api_v2', __name__,)
diff --git a/entityshape/comparejsonld.py b/entityshape/api_v2/comparejsonld.py
similarity index 97%
rename from entityshape/comparejsonld.py
rename to entityshape/api_v2/comparejsonld.py
index 3b5866c..a8c74ff 100644
--- a/entityshape/comparejsonld.py
+++ b/entityshape/api_v2/comparejsonld.py
@@ -7,8 +7,8 @@
 import requests
 from requests import Response
 
-from entityshape.compareproperties import CompareProperties
-from entityshape.comparestatements import CompareStatements
+from entityshape.api_v2.compareproperties import CompareProperties
+from entityshape.api_v2.comparestatements import CompareStatements
 
 
 class CompareJSONLD:
diff --git a/entityshape/compareproperties.py b/entityshape/api_v2/compareproperties.py
similarity index 99%
rename from entityshape/compareproperties.py
rename to entityshape/api_v2/compareproperties.py
index 577e6af..35de1fa 100644
--- a/entityshape/compareproperties.py
+++ b/entityshape/api_v2/compareproperties.py
@@ -1,4 +1,4 @@
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class CompareProperties:
diff --git a/entityshape/comparestatements.py b/entityshape/api_v2/comparestatements.py
similarity index 98%
rename from entityshape/comparestatements.py
rename to entityshape/api_v2/comparestatements.py
index 64f903b..263efa9 100644
--- a/entityshape/comparestatements.py
+++ b/entityshape/api_v2/comparestatements.py
@@ -1,6 +1,6 @@
 from typing import Tuple, Any
 
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class CompareStatements:
diff --git a/entityshape/getjsonld.py b/entityshape/api_v2/getjsonld.py
similarity index 100%
rename from entityshape/getjsonld.py
rename to entityshape/api_v2/getjsonld.py
diff --git a/entityshape/utilities.py b/entityshape/api_v2/utilities.py
similarity index 100%
rename from entityshape/utilities.py
rename to entityshape/api_v2/utilities.py
diff --git a/entityshape/app.py b/entityshape/app.py
index 3f28307..2020082 100644
--- a/entityshape/app.py
+++ b/entityshape/app.py
@@ -4,8 +4,8 @@
 from flask import Flask
 from flask_cors import CORS
 
-from entityshape.api_v1_blueprint import api_v1
-from entityshape.api_v2_blueprint import api_v2
+from entityshape.api_v1.api_v1_blueprint import api_v1
+from entityshape.api_v2.api_v2_blueprint import api_v2
 
 app = Flask(__name__)
 CORS(app)
diff --git a/tests/test_compare_properties.py b/tests/test_compare_properties.py
index e530191..e045694 100644
--- a/tests/test_compare_properties.py
+++ b/tests/test_compare_properties.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.comparejsonld import CompareProperties
+from entityshape.api_v2.comparejsonld import CompareProperties
 
 
 class TestCompareProperties(unittest.TestCase):
diff --git a/tests/test_compare_statements.py b/tests/test_compare_statements.py
index b34f24c..121196b 100644
--- a/tests/test_compare_statements.py
+++ b/tests/test_compare_statements.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.comparejsonld import CompareStatements
+from entityshape.api_v2.comparejsonld import CompareStatements
 
 
 class TestCompareStatements(unittest.TestCase):
diff --git a/tests/test_jsonld.py b/tests/test_jsonld.py
index e3845c9..37c69b3 100644
--- a/tests/test_jsonld.py
+++ b/tests/test_jsonld.py
@@ -3,10 +3,10 @@
 """
 import unittest
 
-from entityshape.comparejsonld import CompareJSONLD
-from entityshape.compareshape import CompareShape
-from entityshape.shape import Shape
-from entityshape.getjsonld import JSONLDShape
+from entityshape.api_v2.comparejsonld import CompareJSONLD
+from entityshape.api_v1.compareshape import CompareShape
+from entityshape.api_v1.shape import Shape
+from entityshape.api_v2.getjsonld import JSONLDShape
 
 
 class JSONLDCase(unittest.TestCase):
diff --git a/tests/test_utilities.py b/tests/test_utilities.py
index 9c08fbf..1b4bde3 100644
--- a/tests/test_utilities.py
+++ b/tests/test_utilities.py
@@ -1,6 +1,6 @@
 import unittest
 
-from entityshape.utilities import Utilities
+from entityshape.api_v2.utilities import Utilities
 
 
 class UtilitiesTests(unittest.TestCase):