diff --git a/src/uloapi/.gitignore b/src/ulo-storage-endpoint/.gitignore
similarity index 100%
rename from src/uloapi/.gitignore
rename to src/ulo-storage-endpoint/.gitignore
diff --git a/src/uloapi/README.md b/src/ulo-storage-endpoint/README.md
similarity index 100%
rename from src/uloapi/README.md
rename to src/ulo-storage-endpoint/README.md
diff --git a/src/uloapi/pom.xml b/src/ulo-storage-endpoint/pom.xml
similarity index 100%
rename from src/uloapi/pom.xml
rename to src/ulo-storage-endpoint/pom.xml
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/config/Config.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/config/Config.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/config/Config.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Errors.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/html/Errors.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Errors.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Filters.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/html/Filters.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Filters.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Main.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/html/Main.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Main.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Routes.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/html/Routes.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/html/Routes.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/GraphDB.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/query/GraphDB.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/GraphDB.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Query.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/query/Query.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Query.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Statistics.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/query/Statistics.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Statistics.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Timer.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/query/Timer.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/Timer.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/ULO.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/query/ULO.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/query/ULO.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Errors.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/rest/Errors.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Errors.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Filters.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/rest/Filters.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Filters.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/JsonTransformer.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Main.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/rest/Main.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Main.java
diff --git a/src/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java b/src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Routes.java
similarity index 100%
rename from src/uloapi/src/main/java/info/mathhub/uloapi/rest/Routes.java
rename to src/ulo-storage-endpoint/src/main/java/info/mathhub/uloapi/rest/Routes.java
diff --git a/src/uloapi/src/main/resources/logback.xml b/src/ulo-storage-endpoint/src/main/resources/logback.xml
similarity index 100%
rename from src/uloapi/src/main/resources/logback.xml
rename to src/ulo-storage-endpoint/src/main/resources/logback.xml
diff --git a/src/uloapi/src/main/resources/spark/template/freemarker/base.flt b/src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/base.flt
similarity index 100%
rename from src/uloapi/src/main/resources/spark/template/freemarker/base.flt
rename to src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/base.flt
diff --git a/src/uloapi/src/main/resources/spark/template/freemarker/error.flt b/src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/error.flt
similarity index 100%
rename from src/uloapi/src/main/resources/spark/template/freemarker/error.flt
rename to src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/error.flt
diff --git a/src/uloapi/src/main/resources/spark/template/freemarker/index.flt b/src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/index.flt
similarity index 100%
rename from src/uloapi/src/main/resources/spark/template/freemarker/index.flt
rename to src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/index.flt
diff --git a/src/uloapi/src/main/resources/spark/template/freemarker/queries.flt b/src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/queries.flt
similarity index 100%
rename from src/uloapi/src/main/resources/spark/template/freemarker/queries.flt
rename to src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/queries.flt
diff --git a/src/uloapi/src/main/resources/spark/template/freemarker/statistics.flt b/src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/statistics.flt
similarity index 100%
rename from src/uloapi/src/main/resources/spark/template/freemarker/statistics.flt
rename to src/ulo-storage-endpoint/src/main/resources/spark/template/freemarker/statistics.flt
diff --git a/src/uloapi/src/main/resources/uloapi.properties b/src/ulo-storage-endpoint/src/main/resources/uloapi.properties
similarity index 100%
rename from src/uloapi/src/main/resources/uloapi.properties
rename to src/ulo-storage-endpoint/src/main/resources/uloapi.properties