diff --git a/src/main/java/org/openepics/names/rest/api/v1/INames.java b/src/main/java/org/openepics/names/rest/api/v1/INames.java
index bd9f7b86e76321bb227b9f62bc63aa7ecdad5e12..3f1b539efbb3751bd10860ebfa06c68aaaf0f108 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/INames.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/INames.java
@@ -22,10 +22,10 @@ import java.util.List;
 
 import org.openepics.names.rest.beans.FieldName;
 import org.openepics.names.rest.beans.NameElement;
-import org.openepics.names.util.response.Response;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageNameElements;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PutMapping;
diff --git a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
index 3b6917fed07aa06c772490737004a546f27d4a67..a6104f92831cb6840290df9409671c06b64f0d27 100644
--- a/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
+++ b/src/main/java/org/openepics/names/rest/api/v1/IStructures.java
@@ -24,10 +24,10 @@ import org.openepics.names.rest.beans.FieldStructure;
 import org.openepics.names.rest.beans.Status;
 import org.openepics.names.rest.beans.StructureElement;
 import org.openepics.names.rest.beans.Type;
-import org.openepics.names.util.response.Response;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageStructureElements;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
diff --git a/src/main/java/org/openepics/names/util/response/Response.java b/src/main/java/org/openepics/names/rest/beans/response/Response.java
similarity index 98%
rename from src/main/java/org/openepics/names/util/response/Response.java
rename to src/main/java/org/openepics/names/rest/beans/response/Response.java
index 6629789596a5a70f5c6b5149cb5da44ce5b6d971..d095d30aa607d6abfb0b0c9ac724e5e367f253d9 100644
--- a/src/main/java/org/openepics/names/util/response/Response.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/Response.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 import org.springframework.http.HttpHeaders;
 
diff --git a/src/main/java/org/openepics/names/util/response/ResponseBoolean.java b/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
similarity index 97%
rename from src/main/java/org/openepics/names/util/response/ResponseBoolean.java
rename to src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
index a9f92e7d2d7b4abfee3417289a020df0da16e8d7..bd839f573faa6e3cd3cb067709699727d5d14f2a 100644
--- a/src/main/java/org/openepics/names/util/response/ResponseBoolean.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponseBoolean.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 /**
  * This class is used to ensure response to request origin are handled in a uniform way.
diff --git a/src/main/java/org/openepics/names/util/response/ResponseBooleanList.java b/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
similarity index 98%
rename from src/main/java/org/openepics/names/util/response/ResponseBooleanList.java
rename to src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
index f5e287e37e3789fb78a60ff1f9d071736645879a..ea83217f0bb9937b81b02b562ab83cd24b550284 100644
--- a/src/main/java/org/openepics/names/util/response/ResponseBooleanList.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponseBooleanList.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 import java.util.List;
 
diff --git a/src/main/java/org/openepics/names/util/response/ResponsePage.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
similarity index 98%
rename from src/main/java/org/openepics/names/util/response/ResponsePage.java
rename to src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
index 16e463898516faf8b3a6982f2552781ea954b5a0..368127873c79fb3d4811fd5d9b4ec47037dde219 100644
--- a/src/main/java/org/openepics/names/util/response/ResponsePage.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePage.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 /**
  * This class is used to ensure response to request origin are handled in a uniform way.
diff --git a/src/main/java/org/openepics/names/util/response/ResponsePageNameElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
similarity index 98%
rename from src/main/java/org/openepics/names/util/response/ResponsePageNameElements.java
rename to src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
index b556ff4f022e1488ee6fca106e0b493da7c0b163..3e1845f9fc520bb3fad5e19a9bcd8eaefe6f1377 100644
--- a/src/main/java/org/openepics/names/util/response/ResponsePageNameElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 import java.util.List;
 
diff --git a/src/main/java/org/openepics/names/util/response/ResponsePageStructureElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
similarity index 98%
rename from src/main/java/org/openepics/names/util/response/ResponsePageStructureElements.java
rename to src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
index 72a6c6c81b7c27ef85eaf944fe04d4fccca87ff2..18399234b46843a5081314cf567986f1849c69c8 100644
--- a/src/main/java/org/openepics/names/util/response/ResponsePageStructureElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 
-package org.openepics.names.util.response;
+package org.openepics.names.rest.beans.response;
 
 import java.util.List;
 
diff --git a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
index bad260843b67b9362ab5791a7b0fa7c3b05c6a96..529d9be2542f24fdf86e0d96f839a5b076521ea8 100644
--- a/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
+++ b/src/main/java/org/openepics/names/rest/controller/GlobalControllerExceptionHandler.java
@@ -22,9 +22,9 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import org.apache.commons.lang3.StringUtils;
+import org.openepics.names.rest.beans.response.Response;
 import org.openepics.names.util.ExceptionUtil;
 import org.openepics.names.util.ServiceHttpStatusException;
-import org.openepics.names.util.response.Response;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ExceptionHandler;
diff --git a/src/main/java/org/openepics/names/rest/controller/NamesController.java b/src/main/java/org/openepics/names/rest/controller/NamesController.java
index c0871c6f2165f00040cd7f840556b6f8dfc344cc..1589499eb1017a430310fdb6aa6e502ece970a0c 100644
--- a/src/main/java/org/openepics/names/rest/controller/NamesController.java
+++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java
@@ -25,14 +25,14 @@ import java.util.logging.Logger;
 import org.openepics.names.rest.api.v1.INames;
 import org.openepics.names.rest.beans.FieldName;
 import org.openepics.names.rest.beans.NameElement;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
 import org.openepics.names.service.NamesService;
 import org.openepics.names.util.ExceptionUtil;
 import org.openepics.names.util.LogUtil;
 import org.openepics.names.util.ServiceHttpStatusException;
-import org.openepics.names.util.response.Response;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageNameElements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/openepics/names/rest/controller/StructuresController.java b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
index 83f684a24aac395eb5d3770dd591e0bbf0b285b6..e9358465a40a98ca3df9cce59c51ce56d3fe9e96 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -27,14 +27,14 @@ import org.openepics.names.rest.beans.FieldStructure;
 import org.openepics.names.rest.beans.Status;
 import org.openepics.names.rest.beans.StructureElement;
 import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
 import org.openepics.names.service.StructuresService;
 import org.openepics.names.util.ExceptionUtil;
 import org.openepics.names.util.LogUtil;
 import org.openepics.names.util.ServiceHttpStatusException;
-import org.openepics.names.util.response.Response;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageStructureElements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
 import org.springframework.http.HttpStatus;
diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java
index d8141f78cd61ce9f8d1847f5dbb4ce7da6ada2bd..6a2055ce8210e196cde1e9382d4e5dd736f57925 100644
--- a/src/main/java/org/openepics/names/service/NamesService.java
+++ b/src/main/java/org/openepics/names/service/NamesService.java
@@ -43,12 +43,12 @@ import org.openepics.names.repository.model.SystemGroup;
 import org.openepics.names.rest.beans.FieldName;
 import org.openepics.names.rest.beans.NameElement;
 import org.openepics.names.rest.beans.Status;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
 import org.openepics.names.util.EssNamingConvention;
 import org.openepics.names.util.HolderIRepositories;
 import org.openepics.names.util.HolderSystemDeviceStructure;
 import org.openepics.names.util.NameElementUtil;
 import org.openepics.names.util.ValidateUtil;
-import org.openepics.names.util.response.ResponsePageNameElements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpStatus;
 import org.springframework.stereotype.Service;
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index 8cc888f82fc530cb4ca990d4db192b7d0704fea3..1c8a2c65821c9c59f2c67ee013d35b152c5c35d1 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -52,6 +52,7 @@ import org.openepics.names.rest.beans.FieldStructure;
 import org.openepics.names.rest.beans.Status;
 import org.openepics.names.rest.beans.StructureElement;
 import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
 import org.openepics.names.util.EssNamingConvention;
 import org.openepics.names.util.HolderIRepositories;
 import org.openepics.names.util.HolderRepositories;
@@ -59,7 +60,6 @@ import org.openepics.names.util.HolderSystemDeviceStructure;
 import org.openepics.names.util.StructureElementUtil;
 import org.openepics.names.util.StructureElementUtil.StructureChoice;
 import org.openepics.names.util.ValidateUtil;
-import org.openepics.names.util.response.ResponsePageStructureElements;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
diff --git a/src/test/java/org/openepics/names/docker/ITUtil.java b/src/test/java/org/openepics/names/docker/ITUtil.java
index 48368e9a46e5f1ba11eaff33a824bec6042e7ab2..56c2a0479e1bbb25b4daa5abd7d165ac6d952f07 100644
--- a/src/test/java/org/openepics/names/docker/ITUtil.java
+++ b/src/test/java/org/openepics/names/docker/ITUtil.java
@@ -31,9 +31,9 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import org.apache.commons.lang3.StringUtils;
-import org.openepics.names.util.response.Response;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.Response;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
 
 /**
  * Utility class to help (Docker) integration tests for Naming and PostgreSQL.
diff --git a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
index 20034d2f2f0857b1c250c37dbc5c27307432794b..a433eb0319f610636241276962ad948b925df3c9 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
@@ -32,10 +32,10 @@ import org.openepics.names.docker.ITUtil.AuthorizationChoice;
 import org.openepics.names.docker.ITUtil.EndpointChoice;
 import org.openepics.names.rest.beans.NameElement;
 import org.openepics.names.rest.beans.Status;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageNameElements;
 import org.openepics.names.util.EnumUtil.NameChoice;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageNameElements;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
diff --git a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
index 86d0967d76d29316fb591856a3e1c840b65cedbf..3f847044e4c629c5a52c021a533b75e8207244ea 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
@@ -33,10 +33,10 @@ import org.openepics.names.docker.ITUtil.EndpointChoice;
 import org.openepics.names.rest.beans.Status;
 import org.openepics.names.rest.beans.StructureElement;
 import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.response.ResponseBoolean;
+import org.openepics.names.rest.beans.response.ResponseBooleanList;
+import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
 import org.openepics.names.util.EnumUtil.StructureChoice;
-import org.openepics.names.util.response.ResponseBoolean;
-import org.openepics.names.util.response.ResponseBooleanList;
-import org.openepics.names.util.response.ResponsePageStructureElements;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;