diff --git a/www/webapp/src/components/Field/Record/A.vue b/www/webapp/src/components/Field/RecordA.vue
similarity index 88%
rename from www/webapp/src/components/Field/Record/A.vue
rename to www/webapp/src/components/Field/RecordA.vue
index 9692532f3..868ccc184 100644
--- a/www/webapp/src/components/Field/Record/A.vue
+++ b/www/webapp/src/components/Field/RecordA.vue
@@ -1,6 +1,6 @@
 <script>
 import { ipAddress } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 export default {
   name: 'RecordA',
diff --git a/www/webapp/src/components/Field/Record/AAAA.vue b/www/webapp/src/components/Field/RecordAAAA.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/AAAA.vue
rename to www/webapp/src/components/Field/RecordAAAA.vue
index 1a9640549..031775bf4 100644
--- a/www/webapp/src/components/Field/Record/AAAA.vue
+++ b/www/webapp/src/components/Field/RecordAAAA.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 // from https://stackoverflow.com/a/17871737/6867099, without the '%' and '.' parts
 const ip6Address = helpers.regex('ip6Address', /^(([0-9a-fA-F]{1,4}:){7,7}[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,7}:|([0-9a-fA-F]{1,4}:){1,6}:[0-9a-fA-F]{1,4}|([0-9a-fA-F]{1,4}:){1,5}(:[0-9a-fA-F]{1,4}){1,2}|([0-9a-fA-F]{1,4}:){1,4}(:[0-9a-fA-F]{1,4}){1,3}|([0-9a-fA-F]{1,4}:){1,3}(:[0-9a-fA-F]{1,4}){1,4}|([0-9a-fA-F]{1,4}:){1,2}(:[0-9a-fA-F]{1,4}){1,5}|[0-9a-fA-F]{1,4}:((:[0-9a-fA-F]{1,4}){1,6})|:((:[0-9a-fA-F]{1,4}){1,7}|:))$/);
diff --git a/www/webapp/src/components/Field/Record/CAA.vue b/www/webapp/src/components/Field/RecordCAA.vue
similarity index 94%
rename from www/webapp/src/components/Field/Record/CAA.vue
rename to www/webapp/src/components/Field/RecordCAA.vue
index ff331ab71..232ceb1b3 100644
--- a/www/webapp/src/components/Field/Record/CAA.vue
+++ b/www/webapp/src/components/Field/RecordCAA.vue
@@ -1,6 +1,6 @@
 <script>
 import { integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const MAX8 = 255;
 const int8 = between(0, MAX8);
diff --git a/www/webapp/src/components/Field/Record/CDNSKEY.vue b/www/webapp/src/components/Field/RecordCDNSKEY.vue
similarity index 65%
rename from www/webapp/src/components/Field/Record/CDNSKEY.vue
rename to www/webapp/src/components/Field/RecordCDNSKEY.vue
index 9366e5482..59bd954ea 100644
--- a/www/webapp/src/components/Field/Record/CDNSKEY.vue
+++ b/www/webapp/src/components/Field/RecordCDNSKEY.vue
@@ -1,5 +1,5 @@
 <script>
-import RecordDNSKEY from './DNSKEY.vue';
+import RecordDNSKEY from './RecordDNSKEY.vue';
 
 export default {
   name: 'RecordCDNSKEY',
diff --git a/www/webapp/src/components/Field/Record/CDS.vue b/www/webapp/src/components/Field/RecordCDS.vue
similarity index 67%
rename from www/webapp/src/components/Field/Record/CDS.vue
rename to www/webapp/src/components/Field/RecordCDS.vue
index e06666380..1110898e4 100644
--- a/www/webapp/src/components/Field/Record/CDS.vue
+++ b/www/webapp/src/components/Field/RecordCDS.vue
@@ -1,5 +1,5 @@
 <script>
-import RecordDS from './DS.vue';
+import RecordDS from './RecordDS.vue';
 
 export default {
   name: 'RecordCDS',
diff --git a/www/webapp/src/components/Field/Record/CNAME.vue b/www/webapp/src/components/Field/RecordCNAME.vue
similarity index 92%
rename from www/webapp/src/components/Field/Record/CNAME.vue
rename to www/webapp/src/components/Field/RecordCNAME.vue
index 11240ac65..81a9b92e8 100644
--- a/www/webapp/src/components/Field/Record/CNAME.vue
+++ b/www/webapp/src/components/Field/RecordCNAME.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z0-9_-]+\.)+[a-zA-Z]{2,}))[.]?$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
diff --git a/www/webapp/src/components/Field/Record/DNSKEY.vue b/www/webapp/src/components/Field/RecordDNSKEY.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/DNSKEY.vue
rename to www/webapp/src/components/Field/RecordDNSKEY.vue
index 3785ced8c..ef083efab 100644
--- a/www/webapp/src/components/Field/Record/DNSKEY.vue
+++ b/www/webapp/src/components/Field/RecordDNSKEY.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);
 
diff --git a/www/webapp/src/components/Field/Record/DS.vue b/www/webapp/src/components/Field/RecordDS.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/DS.vue
rename to www/webapp/src/components/Field/RecordDS.vue
index 0c5f2b8da..0b1988c5d 100644
--- a/www/webapp/src/components/Field/Record/DS.vue
+++ b/www/webapp/src/components/Field/RecordDS.vue
@@ -1,6 +1,6 @@
 <script>
 import { and, helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
 const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
diff --git a/www/webapp/src/components/Field/Record/HTTPS.vue b/www/webapp/src/components/Field/RecordHTTPS.vue
similarity index 66%
rename from www/webapp/src/components/Field/Record/HTTPS.vue
rename to www/webapp/src/components/Field/RecordHTTPS.vue
index 01480af77..05c3e5ae5 100644
--- a/www/webapp/src/components/Field/Record/HTTPS.vue
+++ b/www/webapp/src/components/Field/RecordHTTPS.vue
@@ -1,5 +1,5 @@
 <script>
-import RecordSVCB from './SVCB.vue';
+import RecordSVCB from './RecordSVCB.vue';
 
 export default {
   name: 'RecordHTTPS',
diff --git a/www/webapp/src/components/Field/RecordList.vue b/www/webapp/src/components/Field/RecordList.vue
index 64a7eb12f..9e00e5b89 100644
--- a/www/webapp/src/components/Field/RecordList.vue
+++ b/www/webapp/src/components/Field/RecordList.vue
@@ -31,25 +31,25 @@
 
 <script>
 import RecordItem from './RecordItem.vue';
-import RecordA from './Record/A.vue';
-import RecordAAAA from './Record/AAAA.vue';
-import RecordCAA from './Record/CAA.vue';
-import RecordCDNSKEY from './Record/CDNSKEY.vue';
-import RecordCDS from './Record/CDS.vue';
-import RecordCNAME from './Record/CNAME.vue';
-import RecordDNSKEY from './Record/DNSKEY.vue';
-import RecordDS from './Record/DS.vue';
-import RecordHTTPS from './Record/HTTPS.vue';
-import RecordMX from './Record/MX.vue';
-import RecordNS from './Record/NS.vue';
-import RecordOPENPGPKEY from './Record/OPENPGPKEY.vue';
-import RecordPTR from './Record/PTR.vue';
-import RecordSMIMEA from './Record/SMIMEA.vue';
-import RecordSRV from './Record/SRV.vue';
-import RecordSVCB from './Record/SVCB.vue';
-import RecordTLSA from './Record/TLSA.vue';
-import RecordTXT from './Record/TXT.vue';
-import RecordSubnet from './Record/Subnet.vue';
+import RecordA from './RecordA.vue';
+import RecordAAAA from './RecordAAAA.vue';
+import RecordCAA from './RecordCAA.vue';
+import RecordCDNSKEY from './RecordCDNSKEY.vue';
+import RecordCDS from './RecordCDS.vue';
+import RecordCNAME from './RecordCNAME.vue';
+import RecordDNSKEY from './RecordDNSKEY.vue';
+import RecordDS from './RecordDS.vue';
+import RecordHTTPS from './RecordHTTPS.vue';
+import RecordMX from './RecordMX.vue';
+import RecordNS from './RecordNS.vue';
+import RecordOPENPGPKEY from './RecordOPENPGPKEY.vue';
+import RecordPTR from './RecordPTR.vue';
+import RecordSMIMEA from './RecordSMIMEA.vue';
+import RecordSRV from './RecordSRV.vue';
+import RecordSVCB from './RecordSVCB.vue';
+import RecordTLSA from './RecordTLSA.vue';
+import RecordTXT from './RecordTXT.vue';
+import RecordSubnet from './RecordSubnet.vue';
 import {mdiClose, mdiPlus} from "@mdi/js";
 
 export default {
diff --git a/www/webapp/src/components/Field/Record/MX.vue b/www/webapp/src/components/Field/RecordMX.vue
similarity index 94%
rename from www/webapp/src/components/Field/Record/MX.vue
rename to www/webapp/src/components/Field/RecordMX.vue
index 6f0e82841..e6f166af6 100644
--- a/www/webapp/src/components/Field/Record/MX.vue
+++ b/www/webapp/src/components/Field/RecordMX.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
diff --git a/www/webapp/src/components/Field/Record/NS.vue b/www/webapp/src/components/Field/RecordNS.vue
similarity index 92%
rename from www/webapp/src/components/Field/Record/NS.vue
rename to www/webapp/src/components/Field/RecordNS.vue
index 163da50d2..ad26aa688 100644
--- a/www/webapp/src/components/Field/Record/NS.vue
+++ b/www/webapp/src/components/Field/RecordNS.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const hostname = helpers.regex('hostname', /^((([a-zA-Z0-9-]+\.?)+)|\.)$/);
 const trailingDot = helpers.regex('trailingDot', /[.]$/);
diff --git a/www/webapp/src/components/Field/Record/OPENPGPKEY.vue b/www/webapp/src/components/Field/RecordOPENPGPKEY.vue
similarity index 90%
rename from www/webapp/src/components/Field/Record/OPENPGPKEY.vue
rename to www/webapp/src/components/Field/RecordOPENPGPKEY.vue
index 5bdf167af..caa4f70db 100644
--- a/www/webapp/src/components/Field/Record/OPENPGPKEY.vue
+++ b/www/webapp/src/components/Field/RecordOPENPGPKEY.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const base64 = helpers.regex('base64', /^[0-9a-zA-Z+/][0-9a-zA-Z+/\s]*(=\s*){0,3}$/);
 
diff --git a/www/webapp/src/components/Field/Record/PTR.vue b/www/webapp/src/components/Field/RecordPTR.vue
similarity index 65%
rename from www/webapp/src/components/Field/Record/PTR.vue
rename to www/webapp/src/components/Field/RecordPTR.vue
index 06f4e9c26..2d124cad7 100644
--- a/www/webapp/src/components/Field/Record/PTR.vue
+++ b/www/webapp/src/components/Field/RecordPTR.vue
@@ -1,5 +1,5 @@
 <script>
-import RecordCNAME from './CNAME.vue';
+import RecordCNAME from './RecordCNAME.vue';
 
 export default {
   name: 'RecordPTR',
diff --git a/www/webapp/src/components/Field/Record/SMIMEA.vue b/www/webapp/src/components/Field/RecordSMIMEA.vue
similarity index 66%
rename from www/webapp/src/components/Field/Record/SMIMEA.vue
rename to www/webapp/src/components/Field/RecordSMIMEA.vue
index 27db27511..139e1928f 100644
--- a/www/webapp/src/components/Field/Record/SMIMEA.vue
+++ b/www/webapp/src/components/Field/RecordSMIMEA.vue
@@ -1,5 +1,5 @@
 <script>
-import RecordTLSA from './TLSA.vue';
+import RecordTLSA from './RecordTLSA.vue';
 
 export default {
   name: 'RecordSMIMEA',
diff --git a/www/webapp/src/components/Field/Record/SRV.vue b/www/webapp/src/components/Field/RecordSRV.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/SRV.vue
rename to www/webapp/src/components/Field/RecordSRV.vue
index 27c3b91f2..5044a8544 100644
--- a/www/webapp/src/components/Field/Record/SRV.vue
+++ b/www/webapp/src/components/Field/RecordSRV.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 // Allow for root label only, see RFC 2052
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
diff --git a/www/webapp/src/components/Field/Record/SVCB.vue b/www/webapp/src/components/Field/RecordSVCB.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/SVCB.vue
rename to www/webapp/src/components/Field/RecordSVCB.vue
index fef6b5787..b8d5cce10 100644
--- a/www/webapp/src/components/Field/Record/SVCB.vue
+++ b/www/webapp/src/components/Field/RecordSVCB.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 // Allow for root label only
 const hostname = helpers.regex('hostname', /^((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))?[.]?$/);
diff --git a/www/webapp/src/components/Field/Record/Subnet.vue b/www/webapp/src/components/Field/RecordSubnet.vue
similarity index 96%
rename from www/webapp/src/components/Field/Record/Subnet.vue
rename to www/webapp/src/components/Field/RecordSubnet.vue
index 35851abc4..a2226a16e 100644
--- a/www/webapp/src/components/Field/Record/Subnet.vue
+++ b/www/webapp/src/components/Field/RecordSubnet.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers, or } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 // from https://www.oreilly.com/library/view/regular-expressions-cookbook/9781449327453/ch08s16.html, adding subnet
 const ip4AddressOrSubnet = helpers.regex('ip4Address', /^(?:(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])\.){3}(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9]?[0-9])(\/(3[0-2]|[12]?[0-9]))?$/);
diff --git a/www/webapp/src/components/Field/Record/TLSA.vue b/www/webapp/src/components/Field/RecordTLSA.vue
similarity index 95%
rename from www/webapp/src/components/Field/Record/TLSA.vue
rename to www/webapp/src/components/Field/RecordTLSA.vue
index 1660a1d9d..aa5ee6fdc 100644
--- a/www/webapp/src/components/Field/Record/TLSA.vue
+++ b/www/webapp/src/components/Field/RecordTLSA.vue
@@ -1,6 +1,6 @@
 <script>
 import { and, helpers, integer, between } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const hex = helpers.regex('hex', /^([0-9a-fA-F]\s*)*[0-9a-fA-F]$/);
 const trim = and(helpers.regex('trimBegin', /^[^\s]/), helpers.regex('trimEnd', /[^\s]$/));
diff --git a/www/webapp/src/components/Field/Record/TXT.vue b/www/webapp/src/components/Field/RecordTXT.vue
similarity index 89%
rename from www/webapp/src/components/Field/Record/TXT.vue
rename to www/webapp/src/components/Field/RecordTXT.vue
index 79954afd2..73f2739e4 100644
--- a/www/webapp/src/components/Field/Record/TXT.vue
+++ b/www/webapp/src/components/Field/RecordTXT.vue
@@ -1,6 +1,6 @@
 <script>
 import { helpers } from 'vuelidate/lib/validators';
-import RecordItem from '../RecordItem.vue';
+import RecordItem from './RecordItem.vue';
 
 const txtToken = helpers.regex('txtToken', /^".*"$/);