diff --git a/src/editors/IED.ts b/src/editors/IED.ts
index e8d5ed5dee..bbc1bb1266 100644
--- a/src/editors/IED.ts
+++ b/src/editors/IED.ts
@@ -4,8 +4,8 @@ import '@material/mwc-fab';
import '@material/mwc-select';
import '@material/mwc-list/mwc-list-item';
-import '../zeroline-pane.js';
import './ied/ied-container.js'
+import './substation/zeroline-pane.js';
import { translate } from 'lit-translate';
import { SingleSelectedEvent } from '@material/mwc-list/mwc-list-foundation';
diff --git a/src/editors/Substation.ts b/src/editors/Substation.ts
index 3a8bf271e2..931563d1d8 100644
--- a/src/editors/Substation.ts
+++ b/src/editors/Substation.ts
@@ -3,7 +3,7 @@ import { get } from 'lit-translate';
import '@material/mwc-fab';
-import '../zeroline-pane.js';
+import './substation/zeroline-pane.js';
import { newWizardEvent } from '../foundation.js';
import { wizards } from '../wizards/wizard-library.js';
diff --git a/src/editors/singlelinediagram/sld-drawing.ts b/src/editors/singlelinediagram/sld-drawing.ts
index 2f2682a727..ea97eb654b 100644
--- a/src/editors/singlelinediagram/sld-drawing.ts
+++ b/src/editors/singlelinediagram/sld-drawing.ts
@@ -1,5 +1,5 @@
import { getDescriptionAttribute, getNameAttribute, identity } from '../../foundation.js';
-import { getIcon } from '../../zeroline/foundation.js';
+import { getIcon } from '../substation/foundation.js';
import {
connectivityNodeIcon,
editIcon,
diff --git a/src/zeroline/bay-editor.ts b/src/editors/substation/bay-editor.ts
similarity index 97%
rename from src/zeroline/bay-editor.ts
rename to src/editors/substation/bay-editor.ts
index 8f5c6f0955..349760c72d 100644
--- a/src/zeroline/bay-editor.ts
+++ b/src/editors/substation/bay-editor.ts
@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
import { IconButton } from '@material/mwc-icon-button';
import { ListItem } from '@material/mwc-list/mwc-list-item';
-import '../action-pane.js';
+import '../../action-pane.js';
import './ied-editor.js';
import './conducting-equipment-editor.js';
import './powertransformer-editor.js';
@@ -25,8 +25,8 @@ import {
newWizardEvent,
SCLTag,
tags,
-} from '../foundation.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+} from '../../foundation.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
import { cloneSubstationElement, startMove, styles } from './foundation.js';
function childTags(element: Element | null | undefined): SCLTag[] {
diff --git a/src/zeroline/conducting-equipment-editor.ts b/src/editors/substation/conducting-equipment-editor.ts
similarity index 88%
rename from src/zeroline/conducting-equipment-editor.ts
rename to src/editors/substation/conducting-equipment-editor.ts
index 99caac1b5e..4d1f4297c1 100644
--- a/src/zeroline/conducting-equipment-editor.ts
+++ b/src/editors/substation/conducting-equipment-editor.ts
@@ -9,11 +9,11 @@ import {
import '@material/mwc-fab';
-import '../action-icon.js';
+import '../../action-icon.js';
import { startMove, getIcon } from './foundation.js';
-import { newActionEvent, newWizardEvent } from '../foundation.js';
+import { newActionEvent, newWizardEvent } from '../../foundation.js';
import { BayEditor } from './bay-editor.js';
-import { wizards } from '../wizards/wizard-library.js';
+import { wizards } from '../../wizards/wizard-library.js';
/** [[`SubstationEditor`]] subeditor for a `ConductingEquipment` element. */
@customElement('conducting-equipment-editor')
@@ -68,7 +68,8 @@ export class ConductingEquipmentEditor extends LitElement {
startMove(this, ConductingEquipmentEditor, [BayEditor])}"
+ @click="${() =>
+ startMove(this, ConductingEquipmentEditor, [BayEditor])}"
icon="forward"
>
+ return html`
{
- startMove(this, PowerTransformerEditor, [SubstationEditor, VoltageLevelEditor, BayEditor])
+ startMove(this, PowerTransformerEditor, [
+ SubstationEditor,
+ VoltageLevelEditor,
+ BayEditor,
+ ]);
}}"
icon="forward"
>
diff --git a/src/zeroline/subfunction-editor.ts b/src/editors/substation/subfunction-editor.ts
similarity index 92%
rename from src/zeroline/subfunction-editor.ts
rename to src/editors/substation/subfunction-editor.ts
index 6e12ef7605..ccef24b54c 100644
--- a/src/zeroline/subfunction-editor.ts
+++ b/src/editors/substation/subfunction-editor.ts
@@ -7,9 +7,9 @@ import {
state,
} from 'lit-element';
-import '../action-pane.js';
+import '../../action-pane.js';
import './subfunction-editor.js';
-import { getChildElementsByTagName } from '../foundation.js';
+import { getChildElementsByTagName } from '../../foundation.js';
/** Pane rendering `SubFunction` element with its children */
@customElement('subfunction-editor')
diff --git a/src/zeroline/substation-editor.ts b/src/editors/substation/substation-editor.ts
similarity index 97%
rename from src/zeroline/substation-editor.ts
rename to src/editors/substation/substation-editor.ts
index 2f0dbf86aa..de24073837 100644
--- a/src/zeroline/substation-editor.ts
+++ b/src/editors/substation/substation-editor.ts
@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
import { IconButton } from '@material/mwc-icon-button';
import { ListItem } from '@material/mwc-list/mwc-list-item';
-import '../action-pane.js';
+import '../../action-pane.js';
import './ied-editor.js';
import './powertransformer-editor.js';
import './voltage-level-editor.js';
@@ -24,8 +24,8 @@ import {
newWizardEvent,
SCLTag,
tags,
-} from '../foundation.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+} from '../../foundation.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
import {
cloneSubstationElement,
selectors,
diff --git a/src/zeroline/voltage-level-editor.ts b/src/editors/substation/voltage-level-editor.ts
similarity index 98%
rename from src/zeroline/voltage-level-editor.ts
rename to src/editors/substation/voltage-level-editor.ts
index d1e1548b2e..f22e9ecace 100644
--- a/src/zeroline/voltage-level-editor.ts
+++ b/src/editors/substation/voltage-level-editor.ts
@@ -14,7 +14,7 @@ import { Menu } from '@material/mwc-menu';
import { IconButton } from '@material/mwc-icon-button';
import { ListItem } from '@material/mwc-list/mwc-list-item';
-import '../action-pane.js';
+import '../../action-pane.js';
import './bay-editor.js';
import './ied-editor.js';
import './powertransformer-editor.js';
@@ -30,10 +30,10 @@ import {
newWizardEvent,
SCLTag,
tags,
-} from '../foundation.js';
+} from '../../foundation.js';
import { SubstationEditor } from './substation-editor.js';
-import { emptyWizard, wizards } from '../wizards/wizard-library.js';
+import { emptyWizard, wizards } from '../../wizards/wizard-library.js';
function childTags(element: Element | null | undefined): SCLTag[] {
if (!element) return [];
diff --git a/src/zeroline-pane.ts b/src/editors/substation/zeroline-pane.ts
similarity index 91%
rename from src/zeroline-pane.ts
rename to src/editors/substation/zeroline-pane.ts
index ccb823044a..283b4b1aae 100644
--- a/src/zeroline-pane.ts
+++ b/src/editors/substation/zeroline-pane.ts
@@ -14,17 +14,17 @@ import '@material/mwc-icon-button-toggle';
import { IconButton } from '@material/mwc-icon-button';
import { IconButtonToggle } from '@material/mwc-icon-button-toggle';
-import './zeroline/substation-editor.js';
-import './zeroline/ied-editor.js';
-import { communicationMappingWizard } from './wizards/commmap-wizards.js';
-import { gooseIcon, smvIcon, reportIcon } from './icons/icons.js';
-import { isPublic, newWizardEvent } from './foundation.js';
-import { selectGseControlWizard } from './wizards/gsecontrol.js';
-import { wizards } from './wizards/wizard-library.js';
-import { getAttachedIeds } from './zeroline/foundation.js';
-import { selectSampledValueControlWizard } from './wizards/sampledvaluecontrol.js';
-import { Settings } from './Setting.js';
-import { selectReportControlWizard } from './wizards/reportcontrol.js';
+import './substation-editor.js';
+import './ied-editor.js';
+import { communicationMappingWizard } from '../../wizards/commmap-wizards.js';
+import { gooseIcon, smvIcon, reportIcon } from '../../icons/icons.js';
+import { isPublic, newWizardEvent } from '../../foundation.js';
+import { selectGseControlWizard } from '../../wizards/gsecontrol.js';
+import { wizards } from '../../wizards/wizard-library.js';
+import { getAttachedIeds } from './foundation.js';
+import { selectSampledValueControlWizard } from '../../wizards/sampledvaluecontrol.js';
+import { Settings } from '../../Setting.js';
+import { selectReportControlWizard } from '../../wizards/reportcontrol.js';
function shouldShowIEDs(): boolean {
return localStorage.getItem('showieds') === 'on';
diff --git a/test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js b/test/integration/editors/substation/__snapshots__/bay-editor-wizarding.test.snap.js
similarity index 100%
rename from test/integration/zeroline/__snapshots__/bay-editor-wizarding.test.snap.js
rename to test/integration/editors/substation/__snapshots__/bay-editor-wizarding.test.snap.js
diff --git a/test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js b/test/integration/editors/substation/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
similarity index 100%
rename from test/integration/zeroline/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
rename to test/integration/editors/substation/__snapshots__/conducting-equipment-editor-wizarding.test.snap.js
diff --git a/test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js b/test/integration/editors/substation/__snapshots__/substation-editor-wizarding.test.snap.js
similarity index 100%
rename from test/integration/zeroline/__snapshots__/substation-editor-wizarding.test.snap.js
rename to test/integration/editors/substation/__snapshots__/substation-editor-wizarding.test.snap.js
diff --git a/test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js b/test/integration/editors/substation/__snapshots__/voltage-level-editor-wizarding.test.snap.js
similarity index 100%
rename from test/integration/zeroline/__snapshots__/voltage-level-editor-wizarding.test.snap.js
rename to test/integration/editors/substation/__snapshots__/voltage-level-editor-wizarding.test.snap.js
diff --git a/test/integration/zeroline/bay-editor-wizarding-editing.test.ts b/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts
similarity index 97%
rename from test/integration/zeroline/bay-editor-wizarding-editing.test.ts
rename to test/integration/editors/substation/bay-editor-wizarding-editing.test.ts
index 50c586a9ba..86f737074a 100644
--- a/test/integration/zeroline/bay-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/substation/bay-editor-wizarding-editing.test.ts
@@ -1,12 +1,12 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import '../../../src/zeroline/bay-editor.js';
-import { BayEditor } from '../../../src/zeroline/bay-editor.js';
+import '../../../../src/editors/substation/bay-editor.js';
+import { BayEditor } from '../../../../src/editors/substation/bay-editor.js';
import { Select } from '@material/mwc-select';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
describe('bay-editor wizarding editing integration', () => {
describe('edit wizard', () => {
diff --git a/test/integration/zeroline/bay-editor-wizarding.test.ts b/test/integration/editors/substation/bay-editor-wizarding.test.ts
similarity index 90%
rename from test/integration/zeroline/bay-editor-wizarding.test.ts
rename to test/integration/editors/substation/bay-editor-wizarding.test.ts
index 4d40809df5..8000af015b 100644
--- a/test/integration/zeroline/bay-editor-wizarding.test.ts
+++ b/test/integration/editors/substation/bay-editor-wizarding.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
import fc from 'fast-check';
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
-import '../../../src/zeroline/bay-editor.js';
-import { regExp, regexString } from '../../foundation.js';
+import '../../../../src/editors/substation/bay-editor.js';
+import { regExp, regexString } from '../../../foundation.js';
describe('bay-editor wizarding integration', () => {
let doc: XMLDocument;
diff --git a/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts b/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts
similarity index 95%
rename from test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts
rename to test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts
index 7d27a349c9..46e323d6a8 100644
--- a/test/integration/zeroline/conducting-equipment-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/substation/conducting-equipment-editor-wizarding-editing.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import '../../../src/zeroline/conducting-equipment-editor.js';
-import { ConductingEquipmentEditor } from '../../../src/zeroline/conducting-equipment-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { ConductingEquipmentEditor } from '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
describe('conducting-equipment-editor wizarding editing integration', () => {
describe('edit wizard', () => {
diff --git a/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts b/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts
similarity index 90%
rename from test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts
rename to test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts
index 85872b0e51..de28338c2a 100644
--- a/test/integration/zeroline/conducting-equipment-editor-wizarding.test.ts
+++ b/test/integration/editors/substation/conducting-equipment-editor-wizarding.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
import fc from 'fast-check';
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
-import '../../../src/zeroline/conducting-equipment-editor.js';
-import { regexString, regExp } from '../../foundation.js';
+import '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { regexString, regExp } from '../../../foundation.js';
describe('conducting-equipment-editor wizarding integration', () => {
let doc: XMLDocument;
diff --git a/test/integration/zeroline/ied-editor-wizarding-integration.test.ts b/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts
similarity index 85%
rename from test/integration/zeroline/ied-editor-wizarding-integration.test.ts
rename to test/integration/editors/substation/ied-editor-wizarding-integration.test.ts
index ba67a52b1e..5ea927cdf6 100644
--- a/test/integration/zeroline/ied-editor-wizarding-integration.test.ts
+++ b/test/integration/editors/substation/ied-editor-wizarding-integration.test.ts
@@ -1,11 +1,11 @@
import { expect, fixture, html } from '@open-wc/testing';
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import '../../../src/zeroline/ied-editor.js';
-import { FilteredList } from '../../../src/filtered-list.js';
-import { IedEditor } from '../../../src/zeroline/ied-editor.js';
+import '../../../../src/editors/substation/ied-editor.js';
+import { FilteredList } from '../../../../src/filtered-list.js';
+import { IedEditor } from '../../../../src/editors/substation/ied-editor.js';
describe('IED editor component wizarding editing integration', () => {
let doc: XMLDocument;
diff --git a/test/integration/zeroline/substation-editor-wizarding-editing.test.ts b/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts
similarity index 95%
rename from test/integration/zeroline/substation-editor-wizarding-editing.test.ts
rename to test/integration/editors/substation/substation-editor-wizarding-editing.test.ts
index d7eafbcab3..65e7780fa7 100644
--- a/test/integration/zeroline/substation-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/substation/substation-editor-wizarding-editing.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import '../../../src/zeroline/substation-editor.js';
-import { SubstationEditor } from '../../../src/zeroline/substation-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/substation-editor.js';
+import { SubstationEditor } from '../../../../src/editors/substation/substation-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
describe('substation-editor wizarding editing integration', () => {
describe('edit wizard', () => {
diff --git a/test/integration/zeroline/substation-editor-wizarding.test.ts b/test/integration/editors/substation/substation-editor-wizarding.test.ts
similarity index 90%
rename from test/integration/zeroline/substation-editor-wizarding.test.ts
rename to test/integration/editors/substation/substation-editor-wizarding.test.ts
index 114f0da8f3..9df31bacb6 100644
--- a/test/integration/zeroline/substation-editor-wizarding.test.ts
+++ b/test/integration/editors/substation/substation-editor-wizarding.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
import fc from 'fast-check';
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
-import '../../../src/zeroline/substation-editor.js';
-import { regExp, regexString } from '../../foundation.js';
+import '../../../../src/editors/substation/substation-editor.js';
+import { regExp, regexString } from '../../../foundation.js';
describe('substation-editor wizarding integration', () => {
let doc: XMLDocument;
diff --git a/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts b/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts
similarity index 97%
rename from test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts
rename to test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts
index a578d17c8f..e2c9670038 100644
--- a/test/integration/zeroline/voltage-level-editor-wizarding-editing.test.ts
+++ b/test/integration/editors/substation/voltage-level-editor-wizarding-editing.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../mock-wizard-editor.js';
-import { MockWizardEditor } from '../../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
-import '../../../src/zeroline/voltage-level-editor.js';
-import { VoltageLevelEditor } from '../../../src/zeroline/voltage-level-editor.js';
-import { WizardTextField } from '../../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/voltage-level-editor.js';
+import { VoltageLevelEditor } from '../../../../src/editors/substation/voltage-level-editor.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
describe('voltage-level-editor wizarding editing integration', () => {
describe('edit wizard', () => {
diff --git a/test/integration/zeroline/voltage-level-editor-wizarding.test.ts b/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts
similarity index 96%
rename from test/integration/zeroline/voltage-level-editor-wizarding.test.ts
rename to test/integration/editors/substation/voltage-level-editor-wizarding.test.ts
index 6737a49e23..8e492f2197 100644
--- a/test/integration/zeroline/voltage-level-editor-wizarding.test.ts
+++ b/test/integration/editors/substation/voltage-level-editor-wizarding.test.ts
@@ -1,11 +1,11 @@
import { fixture, html, expect } from '@open-wc/testing';
import fc from 'fast-check';
-import '../../mock-wizard.js';
-import { MockWizard } from '../../mock-wizard.js';
+import '../../../mock-wizard.js';
+import { MockWizard } from '../../../mock-wizard.js';
-import '../../../src/zeroline/voltage-level-editor.js';
-import { regexString, regExp, inverseRegExp } from '../../foundation.js';
+import '../../../../src/editors/substation/voltage-level-editor.js';
+import { regexString, regExp, inverseRegExp } from '../../../foundation.js';
describe('voltage-level-editor wizarding integration', () => {
let doc: XMLDocument;
diff --git a/test/integration/zeroline-pane.test.ts b/test/integration/editors/substation/zeroline-pane.test.ts
similarity index 88%
rename from test/integration/zeroline-pane.test.ts
rename to test/integration/editors/substation/zeroline-pane.test.ts
index e531f0f8b2..5947fb074f 100644
--- a/test/integration/zeroline-pane.test.ts
+++ b/test/integration/editors/substation/zeroline-pane.test.ts
@@ -1,14 +1,14 @@
import { expect, fixture, html } from '@open-wc/testing';
-import '../mock-wizard-editor.js';
-import { MockWizardEditor } from '../mock-wizard-editor.js';
+import '../../../mock-wizard-editor.js';
+import { MockWizardEditor } from '../../../mock-wizard-editor.js';
import { IconButton } from '@material/mwc-icon-button';
-import '../../src/zeroline-pane.js';
-import { FilteredList } from '../../src/filtered-list.js';
-import { ZerolinePane } from '../../src/zeroline-pane.js';
-import { WizardTextField } from '../../src/wizard-textfield.js';
+import '../../../../src/editors/substation/zeroline-pane.js';
+import { FilteredList } from '../../../../src/filtered-list.js';
+import { ZerolinePane } from '../../../../src/editors/substation/zeroline-pane.js';
+import { WizardTextField } from '../../../../src/wizard-textfield.js';
describe('zeroline-pane wizarding editing integration', () => {
let doc: XMLDocument;
diff --git a/test/unit/action-pane.test.ts b/test/unit/action-pane.test.ts
index 4145c1ac1d..0f0c913979 100644
--- a/test/unit/action-pane.test.ts
+++ b/test/unit/action-pane.test.ts
@@ -1,7 +1,7 @@
import { expect, fixture, html } from '@open-wc/testing';
import '../../src/action-pane.js';
-import '../../src/zeroline/bay-editor.js';
+import '../../src/editors/substation/bay-editor.js';
import { ActionPane } from '../../src/action-pane.js';
describe('action-pane', () => {
diff --git a/test/unit/zeroline/BayEditor.test.ts b/test/unit/editors/substation/BayEditor.test.ts
similarity index 88%
rename from test/unit/zeroline/BayEditor.test.ts
rename to test/unit/editors/substation/BayEditor.test.ts
index 7c351f794e..99cf2fd3d5 100644
--- a/test/unit/zeroline/BayEditor.test.ts
+++ b/test/unit/editors/substation/BayEditor.test.ts
@@ -1,10 +1,14 @@
import { fixture, html, expect } from '@open-wc/testing';
-import { WizardInputElement, isCreate, isReplace } from '../../../src/foundation.js';
+import {
+ WizardInputElement,
+ isCreate,
+ isReplace,
+} from '../../../../src/foundation.js';
-import '../../../src/wizard-textfield.js';
-import { createAction } from '../../../src/wizards/bay.js';
-import { updateNamingAction } from '../../../src/wizards/foundation/actions.js';
+import '../../../../src/wizard-textfield.js';
+import { createAction } from '../../../../src/wizards/bay.js';
+import { updateNamingAction } from '../../../../src/wizards/foundation/actions.js';
describe('BayEditor', () => {
const noOp = () => {
diff --git a/test/unit/zeroline/SubstationEditor.test.ts b/test/unit/editors/substation/SubstationEditor.test.ts
similarity index 88%
rename from test/unit/zeroline/SubstationEditor.test.ts
rename to test/unit/editors/substation/SubstationEditor.test.ts
index af34c8bdaf..674e6dcd23 100644
--- a/test/unit/zeroline/SubstationEditor.test.ts
+++ b/test/unit/editors/substation/SubstationEditor.test.ts
@@ -1,9 +1,13 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/wizard-textfield.js';
-import { WizardInputElement, isCreate, isReplace } from '../../../src/foundation.js';
-import { updateNamingAction } from '../../../src/wizards/foundation/actions.js';
-import { createAction } from '../../../src/wizards/substation.js';
+import '../../../../src/wizard-textfield.js';
+import {
+ WizardInputElement,
+ isCreate,
+ isReplace,
+} from '../../../../src/foundation.js';
+import { updateNamingAction } from '../../../../src/wizards/foundation/actions.js';
+import { createAction } from '../../../../src/wizards/substation.js';
describe('SubstationEditor', () => {
const noOp = () => {
diff --git a/test/unit/zeroline/VoltageLevelEditor.test.ts b/test/unit/editors/substation/VoltageLevelEditor.test.ts
similarity index 98%
rename from test/unit/zeroline/VoltageLevelEditor.test.ts
rename to test/unit/editors/substation/VoltageLevelEditor.test.ts
index 4bf53b6a79..d2c8bfc354 100644
--- a/test/unit/zeroline/VoltageLevelEditor.test.ts
+++ b/test/unit/editors/substation/VoltageLevelEditor.test.ts
@@ -1,16 +1,16 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/wizard-textfield.js';
+import '../../../../src/wizard-textfield.js';
import {
WizardInputElement,
isCreate,
isReplace,
isDelete,
-} from '../../../src/foundation.js';
+} from '../../../../src/foundation.js';
import {
createAction,
updateAction,
-} from '../../../src/wizards/voltagelevel.js';
+} from '../../../../src/wizards/voltagelevel.js';
describe('VoltageLevelEditor', () => {
describe('with no nulled properties', () => {
diff --git a/test/unit/zeroline/__snapshots__/bay-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/bay-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/bay-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/bay-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/conducting-equipment-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/conducting-equipment-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/conducting-equipment-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/conducting-equipment-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/function-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/function-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/function-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/function-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/ied-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/ied-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/ied-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/ied-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/powertransformer-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/powertransformer-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/powertransformer-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/powertransformer-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/subfunction-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/subfunction-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/subfunction-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/subfunction-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/substation-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/substation-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/substation-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/substation-editor.test.snap.js
diff --git a/test/unit/zeroline/__snapshots__/voltage-level-editor.test.snap.js b/test/unit/editors/substation/__snapshots__/voltage-level-editor.test.snap.js
similarity index 100%
rename from test/unit/zeroline/__snapshots__/voltage-level-editor.test.snap.js
rename to test/unit/editors/substation/__snapshots__/voltage-level-editor.test.snap.js
diff --git a/test/unit/__snapshots__/zeroline-pane.test.snap.js b/test/unit/editors/substation/__snapshots__/zeroline-pane.test.snap.js
similarity index 100%
rename from test/unit/__snapshots__/zeroline-pane.test.snap.js
rename to test/unit/editors/substation/__snapshots__/zeroline-pane.test.snap.js
diff --git a/test/unit/zeroline/bay-editor.test.ts b/test/unit/editors/substation/bay-editor.test.ts
similarity index 91%
rename from test/unit/zeroline/bay-editor.test.ts
rename to test/unit/editors/substation/bay-editor.test.ts
index 0bcead734b..c0d669d3fa 100644
--- a/test/unit/zeroline/bay-editor.test.ts
+++ b/test/unit/editors/substation/bay-editor.test.ts
@@ -1,7 +1,7 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/zeroline/bay-editor.js';
-import { BayEditor } from '../../../src/zeroline/bay-editor.js';
+import '../../../../src/editors/substation/bay-editor.js';
+import { BayEditor } from '../../../../src/editors/substation/bay-editor.js';
describe('bay-editor', () => {
let element: BayEditor;
diff --git a/test/unit/zeroline/conducting-equipment-editor.test.ts b/test/unit/editors/substation/conducting-equipment-editor.test.ts
similarity index 90%
rename from test/unit/zeroline/conducting-equipment-editor.test.ts
rename to test/unit/editors/substation/conducting-equipment-editor.test.ts
index 41f8c7d06d..dbb2fd692a 100644
--- a/test/unit/zeroline/conducting-equipment-editor.test.ts
+++ b/test/unit/editors/substation/conducting-equipment-editor.test.ts
@@ -1,9 +1,9 @@
import { fixture, html, expect } from '@open-wc/testing';
import { SinonSpy, spy } from 'sinon';
-import '../../../src/zeroline/conducting-equipment-editor.js';
-import { ConductingEquipmentEditor } from '../../../src/zeroline/conducting-equipment-editor.js';
-import { isDelete } from '../../../src/foundation.js';
+import '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { ConductingEquipmentEditor } from '../../../../src/editors/substation/conducting-equipment-editor.js';
+import { isDelete } from '../../../../src/foundation.js';
describe('conducting-equipment-editor', () => {
let element: ConductingEquipmentEditor;
diff --git a/test/unit/zeroline/function-editor.test.ts b/test/unit/editors/substation/function-editor.test.ts
similarity index 89%
rename from test/unit/zeroline/function-editor.test.ts
rename to test/unit/editors/substation/function-editor.test.ts
index 9536ff5008..5d307545cb 100644
--- a/test/unit/zeroline/function-editor.test.ts
+++ b/test/unit/editors/substation/function-editor.test.ts
@@ -1,7 +1,7 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/zeroline/function-editor.js';
-import { FunctionEditor } from '../../../src/zeroline/function-editor.js';
+import '../../../../src/editors/substation/function-editor.js';
+import { FunctionEditor } from '../../../../src/editors/substation/function-editor.js';
describe('web component rendering Function element', () => {
let element: FunctionEditor;
diff --git a/test/unit/zeroline/ied-editor.test.ts b/test/unit/editors/substation/ied-editor.test.ts
similarity index 95%
rename from test/unit/zeroline/ied-editor.test.ts
rename to test/unit/editors/substation/ied-editor.test.ts
index 53f2bd20c2..df4b22f16c 100644
--- a/test/unit/zeroline/ied-editor.test.ts
+++ b/test/unit/editors/substation/ied-editor.test.ts
@@ -1,8 +1,8 @@
import { fixture, html, expect } from '@open-wc/testing';
import { SinonSpy, spy } from 'sinon';
-import '../../../src/zeroline/ied-editor.js';
-import { IedEditor } from '../../../src/zeroline/ied-editor.js';
+import '../../../../src/editors/substation/ied-editor.js';
+import { IedEditor } from '../../../../src/editors/substation/ied-editor.js';
describe('A component to visualize SCL element IED', () => {
let element: IedEditor;
diff --git a/test/unit/zeroline/powertransformer-editor.test.ts b/test/unit/editors/substation/powertransformer-editor.test.ts
similarity index 90%
rename from test/unit/zeroline/powertransformer-editor.test.ts
rename to test/unit/editors/substation/powertransformer-editor.test.ts
index 18bd0f9219..6fcbfd72fd 100644
--- a/test/unit/zeroline/powertransformer-editor.test.ts
+++ b/test/unit/editors/substation/powertransformer-editor.test.ts
@@ -1,10 +1,10 @@
import { fixture, html, expect } from '@open-wc/testing';
import { SinonSpy, spy } from 'sinon';
-import '../../../src/zeroline/powertransformer-editor.js';
+import '../../../../src/editors/substation/powertransformer-editor.js';
-import { PowerTransformerEditor } from '../../../src/zeroline/powertransformer-editor.js';
-import { isDelete } from '../../../src/foundation.js';
+import { PowerTransformerEditor } from '../../../../src/editors/substation/powertransformer-editor.js';
+import { isDelete } from '../../../../src/foundation.js';
describe('powertransformer-editor', () => {
let element: PowerTransformerEditor;
diff --git a/test/unit/zeroline/subfunction-editor.test.ts b/test/unit/editors/substation/subfunction-editor.test.ts
similarity index 88%
rename from test/unit/zeroline/subfunction-editor.test.ts
rename to test/unit/editors/substation/subfunction-editor.test.ts
index 97740500a4..7150f86971 100644
--- a/test/unit/zeroline/subfunction-editor.test.ts
+++ b/test/unit/editors/substation/subfunction-editor.test.ts
@@ -1,7 +1,7 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/zeroline/subfunction-editor.js';
-import { SubFunctionEditor } from '../../../src/zeroline/subfunction-editor.js';
+import '../../../../src/editors/substation/subfunction-editor.js';
+import { SubFunctionEditor } from '../../../../src/editors/substation/subfunction-editor.js';
describe('web component rendering SubFunction element', () => {
let element: SubFunctionEditor;
diff --git a/test/unit/zeroline/substation-editor.test.ts b/test/unit/editors/substation/substation-editor.test.ts
similarity index 90%
rename from test/unit/zeroline/substation-editor.test.ts
rename to test/unit/editors/substation/substation-editor.test.ts
index f12e577b1a..5622761c26 100644
--- a/test/unit/zeroline/substation-editor.test.ts
+++ b/test/unit/editors/substation/substation-editor.test.ts
@@ -1,7 +1,7 @@
import { html, fixture, expect } from '@open-wc/testing';
-import '../../../src/zeroline/substation-editor.js';
-import { SubstationEditor } from '../../../src/zeroline/substation-editor.js';
+import '../../../../src/editors/substation/substation-editor.js';
+import { SubstationEditor } from '../../../../src/editors/substation/substation-editor.js';
describe('substation-editor', () => {
let element: SubstationEditor;
diff --git a/test/unit/zeroline/voltage-level-editor.test.ts b/test/unit/editors/substation/voltage-level-editor.test.ts
similarity index 90%
rename from test/unit/zeroline/voltage-level-editor.test.ts
rename to test/unit/editors/substation/voltage-level-editor.test.ts
index 6029dde38e..0b6e6f4bf6 100644
--- a/test/unit/zeroline/voltage-level-editor.test.ts
+++ b/test/unit/editors/substation/voltage-level-editor.test.ts
@@ -1,7 +1,7 @@
import { fixture, html, expect } from '@open-wc/testing';
-import '../../../src/zeroline/voltage-level-editor.js';
-import { VoltageLevelEditor } from '../../../src/zeroline/voltage-level-editor.js';
+import '../../../../src/editors/substation/voltage-level-editor.js';
+import { VoltageLevelEditor } from '../../../../src/editors/substation/voltage-level-editor.js';
describe('voltage-level-editor', () => {
let element: VoltageLevelEditor;
diff --git a/test/unit/zeroline-pane.test.ts b/test/unit/editors/substation/zeroline-pane.test.ts
similarity index 96%
rename from test/unit/zeroline-pane.test.ts
rename to test/unit/editors/substation/zeroline-pane.test.ts
index aaf88d0c0d..b84b12a8eb 100644
--- a/test/unit/zeroline-pane.test.ts
+++ b/test/unit/editors/substation/zeroline-pane.test.ts
@@ -1,11 +1,11 @@
import { expect, fixture, html } from '@open-wc/testing';
-import '../../src/zeroline-pane.js';
-import { ZerolinePane } from '../../src/zeroline-pane.js';
+import '../../../../src/editors/substation/zeroline-pane.js';
+import { ZerolinePane } from '../../../../src/editors/substation/zeroline-pane.js';
import {
attachedIeds,
getAttachedIeds,
-} from '../../src/zeroline/foundation.js';
+} from '../../../../src/editors/substation/foundation.js';
describe('zeroline-pane', () => {
let doc: XMLDocument;
diff --git a/test/unit/wizards/clientln.test.ts b/test/unit/wizards/clientln.test.ts
index 3dde50a195..ee1c2e9a9f 100644
--- a/test/unit/wizards/clientln.test.ts
+++ b/test/unit/wizards/clientln.test.ts
@@ -6,9 +6,9 @@ import { MockWizardEditor } from '../../mock-wizard-editor.js';
import { List } from '@material/mwc-list';
import { ListItem } from '@material/mwc-list/mwc-list-item';
-import '../../../src/zeroline-pane.js';
-import { IedEditor } from '../../../src/zeroline/ied-editor.js';
-import { ZerolinePane } from '../../../src/zeroline-pane.js';
+import '../../../src/editors/substation/zeroline-pane.js';
+import { IedEditor } from '../../../src/editors/substation/ied-editor.js';
+import { ZerolinePane } from '../../../src/editors/substation/zeroline-pane.js';
describe('clientln wizards', () => {
let doc: Document;
diff --git a/test/unit/wizards/commmap.test.ts b/test/unit/wizards/commmap.test.ts
index 484b17b66a..7da93607d2 100644
--- a/test/unit/wizards/commmap.test.ts
+++ b/test/unit/wizards/commmap.test.ts
@@ -3,12 +3,12 @@ import { expect, fixture, html } from '@open-wc/testing';
import '../../mock-wizard.js';
import { MockWizard } from '../../mock-wizard.js';
-import '../../../src/zeroline-pane.js';
+import '../../../src/editors/substation/zeroline-pane.js';
import {
getSinkReferences,
getSourceReferences,
} from '../../../src/wizards/commmap-wizards.js';
-import { ZerolinePane } from '../../../src/zeroline-pane.js';
+import { ZerolinePane } from '../../../src/editors/substation/zeroline-pane.js';
describe('communication mapping wizard', () => {
let doc: Document;
diff --git a/test/unit/wizards/controlwithiedname.test.ts b/test/unit/wizards/controlwithiedname.test.ts
index 9aa0951f2a..3c8e4ec815 100644
--- a/test/unit/wizards/controlwithiedname.test.ts
+++ b/test/unit/wizards/controlwithiedname.test.ts
@@ -3,9 +3,9 @@ import { expect, fixture, html } from '@open-wc/testing';
import '../../mock-wizard-editor.js';
import { MockWizardEditor } from '../../mock-wizard-editor.js';
-import '../../../src/zeroline-pane.js';
+import '../../../src/editors/substation/zeroline-pane.js';
import { List } from '@material/mwc-list';
-import { ZerolinePane } from '../../../src/zeroline-pane.js';
+import { ZerolinePane } from '../../../src/editors/substation/zeroline-pane.js';
describe('selectExtRefWizard', () => {
let doc: Document;