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 b507b9ff9f7a4b2dbb0c5fdc8fd48c8da3b96fe2..604fc7fd4657b655f26766f2591825bec0e6b9f3 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
@@ -21,12 +21,12 @@ package org.openepics.names.rest.api.v1;
import java.util.List;
import org.openepics.names.rest.beans.FieldName;
+import org.openepics.names.rest.beans.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
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.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
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 b3843152df5103579b3f57700a3d576abbfbc54a..1dba0b7e45123cc2a1e6524a5f50e6f4cfe4a8be 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
@@ -23,12 +23,12 @@ import java.util.List;
import org.openepics.names.rest.beans.FieldStructure;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
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.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
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/rest/beans/NameElement.java b/src/main/java/org/openepics/names/rest/beans/NameElement.java
deleted file mode 100644
index 3177127b7c424f29e315b778ebbc29a4b703f97e..0000000000000000000000000000000000000000
--- a/src/main/java/org/openepics/names/rest/beans/NameElement.java
+++ /dev/null
@@ -1,217 +0,0 @@
-/*
- * Copyright (C) 2021 European Spallation Source ERIC.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package org.openepics.names.rest.beans;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * Bean (data transfer object) for communication and (json, xml) serialization.
- *
- * @author Lars Johansson
- */
-public class NameElement extends NameStructureElement implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -5998490678202969520L;
-
- private UUID parentsystemstructure;
- private UUID parentdevicestructure;
- private String systemstructure;
- private String devicestructure;
- private String index;
- private String name;
-
- /**
- * Public constructor.
- */
- public NameElement () {
- }
-
- /**
- * Public constructor.
- *
- * @param uuid uuid
- * @param parentsystemstructure parent system structure uuid (system group, system, subsystem)
- * @param parentdevicestructure parent device structure uuid (device type)
- * @param systemstructure system structure mnemonic path
- * @param devicestructure device structure mnemonic path
- * @param index instance index
- * @param name name
- * @param description description
- * @param status status
- * @param latest latest
- * @param deleted deleted
- * @param when when
- * @param who who
- * @param comment comment
- */
- public NameElement (
- UUID uuid,
- UUID parentsystemstructure, UUID parentdevicestructure,
- String systemstructure, String devicestructure,
- String index, String name,
- String description, Status status, Boolean latest, Boolean deleted,
- Date when, String who, String comment) {
-
- super(uuid, description, status, latest, deleted, when, who, comment);
-
- setParentsystemstructure(parentsystemstructure);
- setParentdevicestructure(parentdevicestructure);
- setSystemstructure(systemstructure);
- setDevicestructure(devicestructure);
- setIndex(index);
- setName(name);
- }
-
- public UUID getParentsystemstructure() {
- return parentsystemstructure;
- }
- public void setParentsystemstructure(UUID parentsystemstructure) {
- this.parentsystemstructure = parentsystemstructure;
- }
- public UUID getParentdevicestructure() {
- return parentdevicestructure;
- }
- public void setParentdevicestructure(UUID parentdevicestructure) {
- this.parentdevicestructure = parentdevicestructure;
- }
- public String getSystemstructure() {
- return systemstructure;
- }
- public void setSystemstructure(String systemstructure) {
- this.systemstructure = systemstructure;
- }
- public String getDevicestructure() {
- return devicestructure;
- }
- public void setDevicestructure(String devicestructure) {
- this.devicestructure = devicestructure;
- }
- public String getIndex() {
- return index;
- }
- public void setIndex(String index) {
- this.index = index;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
-
- // utility method
- public void setNameAndIndex(String name, String index) {
- this.index = index;
- this.name = name;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
-
- return equals ((NameElement) obj);
- }
-
- public boolean equals(NameElement other) {
- if (other == null)
- return false;
-
- if (!super.equals(other)) {
- return false;
- }
-
- if (getParentsystemstructure() == null) {
- if (other.getParentsystemstructure() != null)
- return false;
- } else if (!getParentsystemstructure().equals(other.getParentsystemstructure()))
- return false;
- if (getParentdevicestructure() == null) {
- if (other.getParentdevicestructure() != null)
- return false;
- } else if (!getParentdevicestructure().equals(other.getParentdevicestructure()))
- return false;
- if (getSystemstructure() == null) {
- if (other.getSystemstructure() != null)
- return false;
- } else if (!getSystemstructure().equals(other.getSystemstructure()))
- return false;
- if (getDevicestructure() == null) {
- if (other.getDevicestructure() != null)
- return false;
- } else if (!getDevicestructure().equals(other.getDevicestructure()))
- return false;
- if (getIndex() == null) {
- if (other.getIndex() != null)
- return false;
- } else if (!getIndex().equals(other.getIndex()))
- return false;
- if (getName() == null) {
- if (other.getName() != null)
- return false;
- } else if (!getName().equals(other.getName()))
- return false;
-
- return true;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- sb.append("\"uuid\": " + getUuid());
- sb.append(", \"parentsystemstructure\": " + getParentsystemstructure());
- sb.append(", \"parentdevicestructure\": " + getParentdevicestructure());
- sb.append(", \"systemstructure\": " + getSystemstructure());
- sb.append(", \"devicestructure\": " + getDevicestructure());
- sb.append(", \"index\": " + getIndex());
- sb.append(", \"name\": " + getName());
- sb.append(", \"description\": " + getDescription());
- sb.append(", \"status\": " + getStatus());
- sb.append(", \"latest\": " + isLatest());
- sb.append(", \"deleted\": " + isDeleted());
- sb.append(", \"when\": " + getWhen());
- sb.append(", \"who\": " + getWho());
- sb.append(", \"comment\": " + getComment());
- sb.append("}");
- return sb.toString();
- }
-
- public String toStringSimple() {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- sb.append("\"uuid\": " + getUuid());
- sb.append(", \"name\": " + getName());
- sb.append(", \"status\": " + getStatus());
- sb.append(", \"latest\": " + isLatest());
- sb.append(", \"deleted\": " + isDeleted());
- sb.append("}");
- return sb.toString();
- }
-
-}
diff --git a/src/main/java/org/openepics/names/rest/beans/NameStructureElement.java b/src/main/java/org/openepics/names/rest/beans/NameStructureElement.java
deleted file mode 100644
index b995fbd2e679ab8dd4b77e2ebcd9aa8a58b95d3d..0000000000000000000000000000000000000000
--- a/src/main/java/org/openepics/names/rest/beans/NameStructureElement.java
+++ /dev/null
@@ -1,189 +0,0 @@
-/*
- * Copyright (C) 2021 European Spallation Source ERIC.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package org.openepics.names.rest.beans;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * Bean (data transfer object) for communication and (json, xml) serialization.
- *
- * @author Lars Johansson
- */
-public abstract class NameStructureElement implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -1124618368080704934L;
-
- private UUID uuid;
- private String description;
- private Status status;
- private Boolean latest;
- private Boolean deleted;
- private Date when;
- private String who;
- private String comment;
-
- /**
- * Public constructor.
- */
- public NameStructureElement() {
- }
-
- /**
- * Public constructor.
- *
- * @param uuid uuid
- * @param description description
- * @param status status
- * @param latest latest
- * @param deleted deleted
- * @param when when
- * @param who who
- * @param comment comment
- */
- public NameStructureElement(
- UUID uuid,
- String description,
- Status status, Boolean latest, Boolean deleted,
- Date when, String who, String comment) {
-
- setUuid(uuid);
- setDescription(description);
- setStatus(status);
- setLatest(latest);
- setDeleted(deleted);
- setWhen(when);
- setWho(who);
- setComment(comment);
- }
-
- public UUID getUuid() {
- return uuid;
- }
- public void setUuid(UUID uuid) {
- this.uuid = uuid;
- }
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public Status getStatus() {
- return status;
- }
- public void setStatus(Status status) {
- this.status = status;
- }
- public Boolean isLatest() {
- return latest;
- }
- public void setLatest(Boolean latest) {
- this.latest = latest;
- }
- public Boolean isDeleted() {
- return deleted;
- }
- public void setDeleted(Boolean deleted) {
- this.deleted = deleted;
- }
- public Date getWhen() {
- return when;
- }
- public void setWhen(Date when) {
- this.when = when;
- }
- public String getWho() {
- return who;
- }
- public void setWho(String who) {
- this.who = who;
- }
- public String getComment() {
- return comment;
- }
- public void setComment(String comment) {
- this.comment = comment;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
-
- return equals((NameStructureElement) obj);
- }
-
- public boolean equals(NameStructureElement other) {
- if (other == null)
- return false;
-
- if (getUuid() == null) {
- if (other.getUuid() != null)
- return false;
- } else if (!getUuid().equals(other.getUuid()))
- return false;
- if (getDescription() == null) {
- if (other.getDescription() != null)
- return false;
- } else if (!getDescription().equals(other.getDescription()))
- return false;
- if (getStatus() == null) {
- if (other.getStatus() != null)
- return false;
- } else if (!getStatus().equals(other.getStatus()))
- return false;
- if (isLatest() == null) {
- if (other.isLatest() != null)
- return false;
- } else if (!isLatest().equals(other.isLatest()))
- return false;
- if (isDeleted() == null) {
- if (other.isDeleted() != null)
- return false;
- } else if (!isDeleted().equals(other.isDeleted()))
- return false;
- if (getWhen() == null) {
- if (other.getWhen() != null)
- return false;
- } else if (!getWhen().equals(other.getWhen()))
- return false;
- if (getWho() == null) {
- if (other.getWho() != null)
- return false;
- } else if (!getWho().equals(other.getWho()))
- return false;
- if (getComment() == null) {
- if (other.getComment() != null)
- return false;
- } else if (!getComment().equals(other.getComment()))
- return false;
-
- return true;
- }
-
-}
diff --git a/src/main/java/org/openepics/names/rest/beans/StructureElement.java b/src/main/java/org/openepics/names/rest/beans/StructureElement.java
deleted file mode 100644
index 7374afc0bfa7db7c3cea541db593bca360e00da2..0000000000000000000000000000000000000000
--- a/src/main/java/org/openepics/names/rest/beans/StructureElement.java
+++ /dev/null
@@ -1,212 +0,0 @@
-/*
- * Copyright (C) 2021 European Spallation Source ERIC.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
- */
-
-package org.openepics.names.rest.beans;
-
-import java.io.Serializable;
-import java.util.Date;
-import java.util.UUID;
-
-/**
- * Bean (data transfer object) for communication and (json, xml) serialization.
- *
- * @author Lars Johansson
- */
-public class StructureElement extends NameStructureElement implements Serializable {
-
- /**
- *
- */
- private static final long serialVersionUID = -8892788697188691804L;
-
- private Type type;
- private UUID parent;
- private String name;
- private String mnemonic;
- private String mnemonicpath;
- private Integer level;
-
- /**
- * Public constructor.
- */
- public StructureElement() {
- }
-
- /**
- * Public constructor.
- *
- * @param type type
- * @param uuid uuid
- * @param parent parent uuid
- * @param name name
- * @param mnemonic mnemonic
- * @param mnemonicpath mnemonic path
- * @param level level
- * @param description description
- * @param status status
- * @param latest latest
- * @param deleted deleted
- * @param when when
- * @param who who
- * @param comment comment
- */
- public StructureElement(
- Type type,
- UUID uuid,
- UUID parent,
- String name, String mnemonic, String mnemonicpath, Integer level,
- String description, Status status, Boolean latest, Boolean deleted,
- Date when, String who, String comment) {
-
- super(uuid, description, status, latest, deleted, when, who, comment);
-
- setType(type);
- setParent(parent);
- setName(name);
- setMnemonic(mnemonic);
- setMnemonicpath(mnemonicpath);
- setLevel(level);
- }
-
- public Type getType() {
- return type;
- }
- public void setType(Type type) {
- this.type = type;
- }
- public UUID getParent() {
- return parent;
- }
- public void setParent(UUID parent) {
- this.parent = parent;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getMnemonic() {
- return mnemonic;
- }
- public void setMnemonic(String mnemonic) {
- this.mnemonic = mnemonic;
- }
- public String getMnemonicpath() {
- return mnemonicpath;
- }
- public void setMnemonicpath(String mnemonicpath) {
- this.mnemonicpath = mnemonicpath;
- }
- public Integer getLevel() {
- return level;
- }
- public void setLevel(Integer level) {
- this.level = level;
- }
-
- @Override
- public boolean equals(Object obj) {
- if (this == obj)
- return true;
- if (obj == null)
- return false;
- if (getClass() != obj.getClass())
- return false;
-
- return equals ((StructureElement) obj);
- }
-
- public boolean equals(StructureElement other) {
- if (other == null)
- return false;
-
- if (!super.equals(other)) {
- return false;
- }
-
- if (getType() == null) {
- if (other.getType() != null)
- return false;
- } else if (!getType().equals(other.getType()))
- return false;
- if (getParent() == null) {
- if (other.getParent() != null)
- return false;
- } else if (!getParent().equals(other.getParent()))
- return false;
- if (getName() == null) {
- if (other.getName() != null)
- return false;
- } else if (!getName().equals(other.getName()))
- return false;
- if (getMnemonic() == null) {
- if (other.getMnemonic() != null)
- return false;
- } else if (!getMnemonic().equals(other.getMnemonic()))
- return false;
- if (getMnemonicpath() == null) {
- if (other.getMnemonicpath() != null)
- return false;
- } else if (!getMnemonicpath().equals(other.getMnemonicpath()))
- return false;
- if (getLevel() == null) {
- if (other.getLevel() != null)
- return false;
- } else if (!getLevel().equals(other.getLevel()))
- return false;
-
- return true;
- }
-
- @Override
- public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- sb.append("\"type\": " + getType());
- sb.append(", \"uuid\": " + getUuid());
- sb.append(", \"parent_uuid\": " + getParent());
- sb.append(", \"name\": " + getName());
- sb.append(", \"mnemonic\": " + getMnemonic());
- sb.append(", \"mnemonicpath\": " + getMnemonicpath());
- sb.append(", \"level\": " + getLevel());
- sb.append(", \"description\": " + getDescription());
- sb.append(", \"status\": " + getStatus());
- sb.append(", \"latest\": " + isLatest());
- sb.append(", \"deleted\": " + isDeleted());
- sb.append(", \"when\": " + getWhen());
- sb.append(", \"who\": " + getWho());
- sb.append(", \"comment\": " + getComment());
- sb.append("}");
- return sb.toString();
- }
-
- public String toStringSimple() {
- StringBuilder sb = new StringBuilder();
- sb.append("{");
- sb.append("\"type\": " + getType());
- sb.append(", \"uuid\": " + getUuid());
- sb.append(", \"mnemonic\": " + getMnemonic());
- sb.append(", \"status\": " + getStatus());
- sb.append(", \"latest\": " + isLatest());
- sb.append(", \"deleted\": " + isDeleted());
- sb.append("}");
- return sb.toString();
- }
-
-}
diff --git a/src/main/java/org/openepics/names/rest/beans/simplified/NameElement.java b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
similarity index 99%
rename from src/main/java/org/openepics/names/rest/beans/simplified/NameElement.java
rename to src/main/java/org/openepics/names/rest/beans/element/NameElement.java
index a5e63cf8d4e5f55be463d03cbce93dcbf7c8bb77..fe91fe70e6c6a1936e36e3e8a7e15aaed2daf4de 100644
--- a/src/main/java/org/openepics/names/rest/beans/simplified/NameElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElement.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package org.openepics.names.rest.beans.simplified;
+package org.openepics.names.rest.beans.element;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/org/openepics/names/rest/beans/simplified/NameElementCommand.java b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
similarity index 99%
rename from src/main/java/org/openepics/names/rest/beans/simplified/NameElementCommand.java
rename to src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
index a9dbdb7c0089845928217ee3590c0705119e1ff0..f3905d082a102c4e79b3cc177204493573ceb039 100644
--- a/src/main/java/org/openepics/names/rest/beans/simplified/NameElementCommand.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/NameElementCommand.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package org.openepics.names.rest.beans.simplified;
+package org.openepics.names.rest.beans.element;
import java.io.Serializable;
import java.util.UUID;
diff --git a/src/main/java/org/openepics/names/rest/beans/simplified/StructureElement.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
similarity index 99%
rename from src/main/java/org/openepics/names/rest/beans/simplified/StructureElement.java
rename to src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
index 3b3e86e3b172acae299202a25c66c038970c421c..a94e8d541213631c626077569a98f42a74f38ff7 100644
--- a/src/main/java/org/openepics/names/rest/beans/simplified/StructureElement.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElement.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package org.openepics.names.rest.beans.simplified;
+package org.openepics.names.rest.beans.element;
import java.io.Serializable;
import java.util.Date;
diff --git a/src/main/java/org/openepics/names/rest/beans/simplified/StructureElementCommand.java b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
similarity index 99%
rename from src/main/java/org/openepics/names/rest/beans/simplified/StructureElementCommand.java
rename to src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
index 036471be81d2acc2a0dc7b0dfd7163b6fd11312b..a1376d4ca62c1f21cbc851ccc6638504ed46d8e1 100644
--- a/src/main/java/org/openepics/names/rest/beans/simplified/StructureElementCommand.java
+++ b/src/main/java/org/openepics/names/rest/beans/element/StructureElementCommand.java
@@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-package org.openepics.names.rest.beans.simplified;
+package org.openepics.names.rest.beans.element;
import java.io.Serializable;
import java.util.UUID;
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
index 2e4b8f9b396ef2cef0866b5c7e1551d3d773c406..eae2830ad9603000fb4c46466cbd601dc20d17ac 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageNameElements.java
@@ -20,7 +20,7 @@ package org.openepics.names.rest.beans.response;
import java.util.List;
-import org.openepics.names.rest.beans.simplified.NameElement;
+import org.openepics.names.rest.beans.element.NameElement;
import com.google.common.collect.Lists;
diff --git a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
index b695b11cbe534a69a15e8e6a6fe07a0650109658..2e7fa5869ffcb6949f88d3754be4e5c0ad618381 100644
--- a/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
+++ b/src/main/java/org/openepics/names/rest/beans/response/ResponsePageStructureElements.java
@@ -20,7 +20,7 @@ package org.openepics.names.rest.beans.response;
import java.util.List;
-import org.openepics.names.rest.beans.simplified.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElement;
import com.google.common.collect.Lists;
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 cdb7f2da438df03d80649f3f432c3292ea9ee38e..eceaad91e1a12b44419be24cdaa97748c4f18232 100644
--- a/src/main/java/org/openepics/names/rest/controller/NamesController.java
+++ b/src/main/java/org/openepics/names/rest/controller/NamesController.java
@@ -24,12 +24,12 @@ 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.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
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.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
import org.openepics.names.service.NamesService;
import org.openepics.names.util.ExceptionUtil;
import org.openepics.names.util.LogUtil;
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 a1848172fc7430c9eeb0620c9718ef55320aafc1..72d4ceccaa88d0c61b125428afabab844ac82d6b 100644
--- a/src/main/java/org/openepics/names/rest/controller/StructuresController.java
+++ b/src/main/java/org/openepics/names/rest/controller/StructuresController.java
@@ -26,12 +26,12 @@ import org.openepics.names.rest.api.v1.IStructures;
import org.openepics.names.rest.beans.FieldStructure;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
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.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
import org.openepics.names.service.StructuresService;
import org.openepics.names.util.ExceptionUtil;
import org.openepics.names.util.LogUtil;
diff --git a/src/main/java/org/openepics/names/service/NamesService.java b/src/main/java/org/openepics/names/service/NamesService.java
index bb4a6a904567e6c4aca4986450f4e7d44f9d5e0f..2253996af7baf8c2c8a9c551fefe2210377e4a2b 100644
--- a/src/main/java/org/openepics/names/service/NamesService.java
+++ b/src/main/java/org/openepics/names/service/NamesService.java
@@ -42,9 +42,9 @@ import org.openepics.names.repository.model.Subsystem;
import org.openepics.names.repository.model.System;
import org.openepics.names.repository.model.SystemGroup;
import org.openepics.names.rest.beans.FieldName;
-import org.openepics.names.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
import org.openepics.names.rest.beans.Status;
+import org.openepics.names.rest.beans.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
import org.openepics.names.rest.beans.response.ResponsePageNameElements;
import org.openepics.names.util.EssNamingConvention;
import org.openepics.names.util.HolderIRepositories;
diff --git a/src/main/java/org/openepics/names/service/StructuresService.java b/src/main/java/org/openepics/names/service/StructuresService.java
index ebf72ec030d91c5fa31b2fe6c31acdbf12fc0630..7d3425da1869a3f5f9034d34eb201227edc33800 100644
--- a/src/main/java/org/openepics/names/service/StructuresService.java
+++ b/src/main/java/org/openepics/names/service/StructuresService.java
@@ -50,9 +50,9 @@ import org.openepics.names.repository.model.System;
import org.openepics.names.repository.model.SystemGroup;
import org.openepics.names.rest.beans.FieldStructure;
import org.openepics.names.rest.beans.Status;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.rest.beans.response.ResponsePageStructureElements;
import org.openepics.names.util.EssNamingConvention;
import org.openepics.names.util.HolderIRepositories;
diff --git a/src/main/java/org/openepics/names/util/NameElementUtil.java b/src/main/java/org/openepics/names/util/NameElementUtil.java
index 80bd288c88bc14ca22d83c1a3dda5af7c33d2087..7141fb592487dde4900caf83b8947f3bda64d2cc 100644
--- a/src/main/java/org/openepics/names/util/NameElementUtil.java
+++ b/src/main/java/org/openepics/names/util/NameElementUtil.java
@@ -27,8 +27,8 @@ import org.openepics.names.repository.model.Subsystem;
import org.openepics.names.repository.model.System;
import org.openepics.names.repository.model.SystemGroup;
import org.openepics.names.rest.beans.Status;
-import org.openepics.names.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
+import org.openepics.names.rest.beans.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
/**
* Utility class to assist in populating name elements based on repository content.
diff --git a/src/main/java/org/openepics/names/util/StructureElementUtil.java b/src/main/java/org/openepics/names/util/StructureElementUtil.java
index f3f140c2ccf68923988b214d0602dcba82ccaaf0..f26e2aca790a68c5034917aaacf4ba3a9b06f5a3 100644
--- a/src/main/java/org/openepics/names/util/StructureElementUtil.java
+++ b/src/main/java/org/openepics/names/util/StructureElementUtil.java
@@ -32,7 +32,7 @@ import org.openepics.names.repository.model.System;
import org.openepics.names.repository.model.SystemGroup;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElement;
import com.google.common.collect.Lists;
diff --git a/src/main/java/org/openepics/names/util/ValidateUtil.java b/src/main/java/org/openepics/names/util/ValidateUtil.java
index 9113dae6aa1d606973a6c747137db9b36786207c..6ee8f1a54179240b3b6f6ccdaa8b45f2545aaa95 100644
--- a/src/main/java/org/openepics/names/util/ValidateUtil.java
+++ b/src/main/java/org/openepics/names/util/ValidateUtil.java
@@ -34,8 +34,8 @@ import org.openepics.names.rest.beans.FieldName;
import org.openepics.names.rest.beans.FieldStructure;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.NameElementCommand;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.springframework.http.HttpStatus;
/**
diff --git a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
index da3d4709566eff49363ea225d7fa65701a40359b..21bf909e0f66052327d14acbc477b2dc6076d68a 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilNameElement.java
@@ -31,11 +31,11 @@ import java.util.UUID;
import org.openepics.names.docker.ITUtil.AuthorizationChoice;
import org.openepics.names.docker.ITUtil.EndpointChoice;
import org.openepics.names.rest.beans.Status;
+import org.openepics.names.rest.beans.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
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.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
import org.openepics.names.util.EnumUtil.NameChoice;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
index 830d2167a379436422b987ee9d7f312ac489030e..013d109c90b82a02c2a036a869bd01e7a8e693d5 100644
--- a/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
+++ b/src/test/java/org/openepics/names/docker/ITUtilStructureElement.java
@@ -32,11 +32,11 @@ import org.openepics.names.docker.ITUtil.AuthorizationChoice;
import org.openepics.names.docker.ITUtil.EndpointChoice;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
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.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import com.fasterxml.jackson.core.JsonProcessingException;
diff --git a/src/test/java/org/openepics/names/docker/NamesIT.java b/src/test/java/org/openepics/names/docker/NamesIT.java
index c1e296870cce0f65a2b667c1dbbd60d45a9fee8b..30a041c3708c4c9a5afa96598586fda8dee8d076 100644
--- a/src/test/java/org/openepics/names/docker/NamesIT.java
+++ b/src/test/java/org/openepics/names/docker/NamesIT.java
@@ -28,10 +28,10 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.NameElement;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.NameElement;
+import org.openepics.names.rest.beans.element.NameElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.NameChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
index e0752d90dbe0eee8acc34081faefe8f767c9478f..9b0ae663eeefee1def83262eaae7972703b7dfdc 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceGroupIT.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
index bccffd7efead7f38c9fd2222cd63590a20b8f231..7f6e2e4874c8ef8d4d173cc0a39ad4ba5b7a8b2c 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDeviceTypeIT.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
index 5356f0c1e7512cfbd710635a2f0c7d09e013ed8e..1240e0be6aacb90b1dd4e71a0c0db8259ea56be5 100644
--- a/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresDisciplineIT.java
@@ -29,8 +29,8 @@ import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
index 17786f6edf4508d386d13b14503fdae2941cddb9..6b41067b3faa4b5e4ea7172a837686b440443384 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSubsystemIT.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
index e83fc7e4a8d93fb76d1a297b5fd48b1f85e5ec29..ee1f01fb1d29cd238771cddd80bbc42779185264 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemGroupIT.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
index b23a1c480fba35b2df191c1a984176121f70908c..a9429c4e6f23503109ddebd59fe642876b95f977 100644
--- a/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
+++ b/src/test/java/org/openepics/names/docker/StructuresSystemIT.java
@@ -30,8 +30,8 @@ import java.util.UUID;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.Test;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.StructureChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
index 6b38b0ef8d4e41f0d3602d688502fcacf61d03d9..1da3e0c2d544a9d4accda9e98a6a2e911e7abe67 100644
--- a/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
+++ b/src/test/java/org/openepics/names/docker/complex/NamesInstanceIndexIT.java
@@ -28,9 +28,9 @@ import org.openepics.names.docker.ITUtilNameElement;
import org.openepics.names.docker.ITUtilStructureElement;
import org.openepics.names.rest.beans.Status;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.NameElementCommand;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.NameElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.openepics.names.util.EnumUtil.NameChoice;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
diff --git a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
index 4e31020be0e56aee04b55a2ef2c794f69da6803d..938ae980884d1690ea88d8e020229b16b0005492 100644
--- a/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
+++ b/src/test/java/org/openepics/names/docker/complex/StructuresCreateLevel3IT.java
@@ -29,8 +29,8 @@ import org.junit.jupiter.api.Test;
import org.openepics.names.docker.ITUtil;
import org.openepics.names.docker.ITUtilStructureElement;
import org.openepics.names.rest.beans.Type;
-import org.openepics.names.rest.beans.simplified.StructureElement;
-import org.openepics.names.rest.beans.simplified.StructureElementCommand;
+import org.openepics.names.rest.beans.element.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElementCommand;
import org.testcontainers.containers.DockerComposeContainer;
import org.testcontainers.containers.wait.strategy.Wait;
import org.testcontainers.junit.jupiter.Container;
diff --git a/src/test/java/org/openepics/names/util/NameElementUtilTest.java b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
index 7424047f15498b1ef2598c8cb21d86cc1e238551..3e91aa7d9fbceafeb88018b08199d27847743f7b 100644
--- a/src/test/java/org/openepics/names/util/NameElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/NameElementUtilTest.java
@@ -25,7 +25,7 @@ import static org.junit.jupiter.api.Assertions.assertNull;
import org.junit.jupiter.api.Test;
import org.openepics.names.repository.model.Name;
import org.openepics.names.rest.beans.Status;
-import org.openepics.names.rest.beans.simplified.NameElement;
+import org.openepics.names.rest.beans.element.NameElement;
/**
* Unit tests for NameElementUtil class.
diff --git a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
index 08edd6b746c93a3d814395de0546815fa7e05299..d397454d4f5607008ee25d4e5139f64812478ac7 100644
--- a/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
+++ b/src/test/java/org/openepics/names/util/StructureElementUtilTest.java
@@ -23,7 +23,7 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
import org.junit.jupiter.api.Test;
-import org.openepics.names.rest.beans.simplified.StructureElement;
+import org.openepics.names.rest.beans.element.StructureElement;
/**
* Unit tests for StructureElementUtil class.