diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
new file mode 100644
index 0000000..00d7385
--- /dev/null
+++ b/.github/workflows/build.yml
@@ -0,0 +1,23 @@
+# This workflow will build a Java project with Maven, and cache/restore any dependencies to improve the workflow execution time
+# For more information see: https://docs.github.com/en/actions/automating-builds-and-tests/building-and-testing-java-with-maven
+
+name: Build
+
+on: [push, pull_request]
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        distribution: ['temurin']
+        java: ['11', '17', '23']
+    name: Java ${{matrix.java}} (${{matrix.distribution}}) build
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          distribution: ${{matrix.distribution}}
+          java-version: ${{matrix.java}}
+      - name: Build with Maven
+        run: mvn --batch-mode verify
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
new file mode 100644
index 0000000..d69ff37
--- /dev/null
+++ b/.github/workflows/release.yml
@@ -0,0 +1,26 @@
+# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
+# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
+
+name: Release
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-java@v4
+        with:
+          java-version: '17'
+          distribution: 'temurin'
+      - name: Publish package
+        run: mvn --batch-mode deploy
+        env:
+          GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
diff --git a/.gitignore b/.gitignore
index 3de64ae..2b6192f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -19,3 +19,8 @@
 *.tar.gz
 *.rar
 
+# VS Code
+.vscode/
+
+# Maven
+**/target/
diff --git a/CGMES_2.4.15_27JAN2020/pom.xml b/CGMES_2.4.15_27JAN2020/pom.xml
new file mode 100644
index 0000000..c6df563
--- /dev/null
+++ b/CGMES_2.4.15_27JAN2020/pom.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.lfenergy.sogno</groupId>
+        <artifactId>cim4j-parent</artifactId>
+        <version>0.1.0</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>cim4j-cgmes-2-4-15</artifactId>
+
+    <name>Java classes for CIM / CGMES 2.4.15</name>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.4.2</version>
+                <configuration>
+                    <archive>
+                        <manifest>
+                            <mainClass>Cim4j</mainClass>
+                        </manifest>
+                    </archive>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>
diff --git a/CGMES_2.4.15_27JAN2020/Cim4j.java b/CGMES_2.4.15_27JAN2020/src/main/java/Cim4j.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/Cim4j.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/Cim4j.java
diff --git a/CGMES_2.4.15_27JAN2020/XMLTest.java b/CGMES_2.4.15_27JAN2020/src/main/java/XMLTest.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/XMLTest.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/XMLTest.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ACDCConverter.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverter.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ACDCConverter.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverter.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ACDCConverterDCTerminal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverterDCTerminal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ACDCConverterDCTerminal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCConverterDCTerminal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ACDCTerminal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCTerminal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ACDCTerminal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACDCTerminal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ACLineSegment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACLineSegment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ACLineSegment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ACLineSegment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Accumulator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Accumulator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Accumulator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Accumulator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AccumulatorLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AccumulatorLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AccumulatorLimitSet.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimitSet.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AccumulatorLimitSet.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorLimitSet.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AccumulatorReset.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorReset.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AccumulatorReset.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorReset.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AccumulatorValue.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorValue.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AccumulatorValue.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AccumulatorValue.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ActivePower.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePower.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ActivePower.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePower.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ActivePowerLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ActivePowerLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ActivePowerPerCurrentFlow.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerPerCurrentFlow.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ActivePowerPerCurrentFlow.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerPerCurrentFlow.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ActivePowerPerFrequency.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerPerFrequency.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ActivePowerPerFrequency.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ActivePowerPerFrequency.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Analog.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Analog.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Analog.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Analog.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AnalogControl.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogControl.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AnalogControl.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogControl.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AnalogLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AnalogLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AnalogLimitSet.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogLimitSet.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AnalogLimitSet.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogLimitSet.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AnalogValue.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogValue.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AnalogValue.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AnalogValue.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AngleDegrees.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AngleDegrees.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AngleDegrees.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AngleDegrees.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AngleRadians.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AngleRadians.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AngleRadians.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AngleRadians.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ApparentPower.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ApparentPower.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ApparentPower.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ApparentPower.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ApparentPowerLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ApparentPowerLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ApparentPowerLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ApparentPowerLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Area.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Area.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Area.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Area.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachine.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachine.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachine.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachine.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineEquivalentCircuit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineEquivalentCircuit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineEquivalentCircuit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineEquivalentCircuit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineTimeConstantReactance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineTimeConstantReactance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineTimeConstantReactance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineTimeConstantReactance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AsynchronousMachineUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AsynchronousMachineUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/AttributeInterface.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AttributeInterface.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/AttributeInterface.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/AttributeInterface.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BaseClass.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClass.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BaseClass.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClass.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BaseClassBuilder.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClassBuilder.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BaseClassBuilder.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClassBuilder.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BaseClassInterface.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClassInterface.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BaseClassInterface.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseClassInterface.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BaseVoltage.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseVoltage.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BaseVoltage.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BaseVoltage.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BasicIntervalSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BasicIntervalSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BasicIntervalSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BasicIntervalSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Bay.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Bay.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Bay.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Bay.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Boolean.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Boolean.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Boolean.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Boolean.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Breaker.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Breaker.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Breaker.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Breaker.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BusNameMarker.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BusNameMarker.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BusNameMarker.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BusNameMarker.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/BusbarSection.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BusbarSection.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/BusbarSection.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/BusbarSection.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CIMClassMap.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CIMClassMap.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CIMClassMap.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CIMClassMap.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Capacitance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Capacitance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Capacitance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Capacitance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CapacitancePerLength.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CapacitancePerLength.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CapacitancePerLength.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CapacitancePerLength.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Command.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Command.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Command.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Command.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Conductance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Conductance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Conductance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Conductance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConductingEquipment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConductingEquipment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConductingEquipment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConductingEquipment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Conductor.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Conductor.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Conductor.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Conductor.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConformLoad.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoad.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConformLoad.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoad.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConformLoadGroup.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoadGroup.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConformLoadGroup.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoadGroup.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConformLoadSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoadSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConformLoadSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConformLoadSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConnectivityNode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConnectivityNode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConnectivityNode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConnectivityNode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ConnectivityNodeContainer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConnectivityNodeContainer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ConnectivityNodeContainer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ConnectivityNodeContainer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Connector.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Connector.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Connector.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Connector.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Control.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Control.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Control.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Control.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ControlArea.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlArea.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ControlArea.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlArea.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ControlAreaGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlAreaGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ControlAreaGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlAreaGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ControlAreaTypeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlAreaTypeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ControlAreaTypeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ControlAreaTypeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CoordinateSystem.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CoordinateSystem.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CoordinateSystem.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CoordinateSystem.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CsConverter.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsConverter.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CsConverter.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsConverter.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CsOperatingModeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsOperatingModeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CsOperatingModeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsOperatingModeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CsPpccControlKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsPpccControlKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CsPpccControlKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CsPpccControlKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Currency.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Currency.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Currency.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Currency.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CurrentFlow.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurrentFlow.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CurrentFlow.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurrentFlow.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CurrentLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurrentLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CurrentLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurrentLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Curve.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Curve.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Curve.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Curve.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CurveData.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurveData.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CurveData.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurveData.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/CurveStyle.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurveStyle.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/CurveStyle.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/CurveStyle.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCBaseTerminal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBaseTerminal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCBaseTerminal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBaseTerminal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCBreaker.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBreaker.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCBreaker.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBreaker.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCBusbar.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBusbar.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCBusbar.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCBusbar.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCChopper.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCChopper.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCChopper.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCChopper.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCConductingEquipment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConductingEquipment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCConductingEquipment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConductingEquipment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCConverterOperatingModeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConverterOperatingModeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCConverterOperatingModeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConverterOperatingModeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCConverterUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConverterUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCConverterUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCConverterUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCDisconnector.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCDisconnector.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCDisconnector.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCDisconnector.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCEquipmentContainer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCEquipmentContainer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCEquipmentContainer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCEquipmentContainer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCGround.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCGround.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCGround.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCGround.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCLine.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCLine.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCLine.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCLine.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCLineSegment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCLineSegment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCLineSegment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCLineSegment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCNode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCNode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCNode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCNode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCPolarityKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCPolarityKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCPolarityKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCPolarityKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCSeriesDevice.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCSeriesDevice.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCSeriesDevice.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCSeriesDevice.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCShunt.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCShunt.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCShunt.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCShunt.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCSwitch.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCSwitch.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCSwitch.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCSwitch.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCTerminal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTerminal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCTerminal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTerminal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCTopologicalIsland.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTopologicalIsland.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCTopologicalIsland.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTopologicalIsland.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DCTopologicalNode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTopologicalNode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DCTopologicalNode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DCTopologicalNode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Date.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Date.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Date.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Date.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DateTime.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DateTime.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DateTime.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DateTime.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DayType.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DayType.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DayType.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DayType.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Decimal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Decimal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Decimal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Decimal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Diagram.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Diagram.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Diagram.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Diagram.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramLayoutVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramLayoutVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramLayoutVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramLayoutVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramObject.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObject.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramObject.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObject.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectGluePoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectGluePoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectGluePoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectGluePoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectPoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectPoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectPoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectPoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectStyle.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectStyle.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramObjectStyle.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramObjectStyle.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiagramStyle.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramStyle.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiagramStyle.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiagramStyle.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscExcContIEEEDEC3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscExcContIEEEDEC3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Disconnector.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Disconnector.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Disconnector.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Disconnector.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscontinuousExcitationControlDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscontinuousExcitationControlDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscontinuousExcitationControlDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscontinuousExcitationControlDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscontinuousExcitationControlUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscontinuousExcitationControlUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscontinuousExcitationControlUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscontinuousExcitationControlUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Discrete.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Discrete.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Discrete.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Discrete.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DiscreteValue.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscreteValue.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DiscreteValue.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DiscreteValue.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DroopSignalFeedbackKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DroopSignalFeedbackKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DroopSignalFeedbackKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DroopSignalFeedbackKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DynamicsFunctionBlock.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DynamicsFunctionBlock.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DynamicsFunctionBlock.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DynamicsFunctionBlock.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/DynamicsVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DynamicsVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/DynamicsVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/DynamicsVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EarthFaultCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EarthFaultCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EarthFaultCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EarthFaultCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EnergyArea.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergyArea.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EnergyArea.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergyArea.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EnergyConsumer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergyConsumer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EnergyConsumer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergyConsumer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EnergySchedulingType.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergySchedulingType.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EnergySchedulingType.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergySchedulingType.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EnergySource.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergySource.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EnergySource.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EnergySource.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Equipment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Equipment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Equipment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Equipment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquipmentBoundaryVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentBoundaryVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquipmentBoundaryVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentBoundaryVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquipmentContainer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentContainer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquipmentContainer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentContainer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquipmentVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquipmentVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquipmentVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquivalentBranch.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentBranch.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquivalentBranch.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentBranch.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquivalentEquipment.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentEquipment.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquivalentEquipment.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentEquipment.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquivalentInjection.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentInjection.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquivalentInjection.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentInjection.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquivalentNetwork.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentNetwork.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquivalentNetwork.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentNetwork.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/EquivalentShunt.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentShunt.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/EquivalentShunt.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/EquivalentShunt.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC4A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC4A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC4A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC4A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC5A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC5A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC5A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC5A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC6A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC6A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC6A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC6A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAC8B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC8B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAC8B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAC8B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcANS.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcANS.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcANS.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcANS.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR3.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR3.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR3.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR3.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR4.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR4.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR4.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR4.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR5.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR5.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR5.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR5.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcAVR7.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR7.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcAVR7.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcAVR7.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcBBC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcBBC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcBBC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcBBC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcCZ.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcCZ.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcCZ.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcCZ.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcDC1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcDC1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcDC2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcDC2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcDC3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcDC3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcDC3A1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC3A1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcDC3A1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcDC3A1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcELIN1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcELIN1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcELIN1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcELIN1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcELIN2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcELIN2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcELIN2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcELIN2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcHU.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcHU.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcHU.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcHU.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC4A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC4A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC4A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC4A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC5A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC5A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC5A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC5A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC6A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC6A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC6A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC6A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC7B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC7B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC7B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC7B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC8B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC8B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEAC8B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEAC8B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC4B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC4B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEDC4B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEDC4B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST1AUELselectorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST1AUELselectorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST1AUELselectorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST1AUELselectorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST4B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST4B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST4B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST4B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST5B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST5B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST5B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST5B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST6B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST6B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST6B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST6B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST7B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST7B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcIEEEST7B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcIEEEST7B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcOEX3T.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcOEX3T.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcOEX3T.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcOEX3T.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcPIC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcPIC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcPIC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcPIC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcREXS.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcREXS.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcREXS.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcREXS.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcREXSFeedbackSignalKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcREXSFeedbackSignalKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcREXSFeedbackSignalKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcREXSFeedbackSignalKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcSCRX.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSCRX.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcSCRX.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSCRX.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcSEXS.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSEXS.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcSEXS.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSEXS.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcSK.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSK.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcSK.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcSK.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST2A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST2A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST2A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST2A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST3A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST3A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST3A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST3A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST4B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST4B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST4B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST4B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST6B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST6B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST6B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST6B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST6BOELselectorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST6BOELselectorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST6BOELselectorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST6BOELselectorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST7B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST7B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST7BOELselectorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7BOELselectorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST7BOELselectorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7BOELselectorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcST7BUELselectorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7BUELselectorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcST7BUELselectorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcST7BUELselectorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcitationSystemDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcitationSystemDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcitationSystemDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcitationSystemDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExcitationSystemUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcitationSystemUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExcitationSystemUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExcitationSystemUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ExternalNetworkInjection.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExternalNetworkInjection.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ExternalNetworkInjection.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ExternalNetworkInjection.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Float.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Float.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Float.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Float.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/FossilFuel.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FossilFuel.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/FossilFuel.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FossilFuel.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/FrancisGovernorControlKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FrancisGovernorControlKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/FrancisGovernorControlKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FrancisGovernorControlKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Frequency.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Frequency.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Frequency.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Frequency.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/FuelType.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FuelType.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/FuelType.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/FuelType.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GenICompensationForGenJ.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GenICompensationForGenJ.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GenICompensationForGenJ.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GenICompensationForGenJ.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GeneratorControlSource.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeneratorControlSource.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GeneratorControlSource.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeneratorControlSource.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GenericNonLinearLoadModelKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GenericNonLinearLoadModelKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GenericNonLinearLoadModelKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GenericNonLinearLoadModelKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GeographicalLocationVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeographicalLocationVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GeographicalLocationVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeographicalLocationVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GeographicalRegion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeographicalRegion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GeographicalRegion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GeographicalRegion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovCT1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovCT1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovCT1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovCT1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovCT2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovCT2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovCT2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovCT2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGAST.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGAST.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGAST1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGAST1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGAST2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGAST2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGAST3.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST3.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGAST3.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST3.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGAST4.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST4.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGAST4.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGAST4.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovGASTWD.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGASTWD.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovGASTWD.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovGASTWD.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydro1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydro1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydro2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydro2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydro3.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro3.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydro3.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro3.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydro4.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro4.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydro4.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydro4.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroDD.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroDD.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroDD.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroDD.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroFrancis.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroFrancis.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroFrancis.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroFrancis.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroIEEE0.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroIEEE0.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroIEEE0.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroIEEE0.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroIEEE2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroIEEE2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroIEEE2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroIEEE2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroPID.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPID.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroPID.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPID.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroPID2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPID2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroPID2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPID2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroPelton.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPelton.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroPelton.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroPelton.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroR.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroR.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroR.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroR.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroWEH.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroWEH.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroWEH.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroWEH.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovHydroWPID.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroWPID.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovHydroWPID.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovHydroWPID.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteam0.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam0.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteam0.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam0.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteam1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteam1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteam2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteam2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteam2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamCC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamCC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamCC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamCC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamEU.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamEU.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamEU.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamEU.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV3.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV3.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV3.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV3.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV4.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV4.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamFV4.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamFV4.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamIEEE1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamIEEE1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamIEEE1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamIEEE1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GovSteamSGO.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamSGO.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GovSteamSGO.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GovSteamSGO.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GrossToNetActivePowerCurve.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GrossToNetActivePowerCurve.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GrossToNetActivePowerCurve.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GrossToNetActivePowerCurve.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Ground.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Ground.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Ground.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Ground.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GroundDisconnector.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GroundDisconnector.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GroundDisconnector.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GroundDisconnector.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/GroundingImpedance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GroundingImpedance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/GroundingImpedance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/GroundingImpedance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/HydroEnergyConversionKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroEnergyConversionKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/HydroEnergyConversionKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroEnergyConversionKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/HydroGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/HydroGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/HydroPlantStorageKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPlantStorageKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/HydroPlantStorageKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPlantStorageKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/HydroPowerPlant.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPowerPlant.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/HydroPowerPlant.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPowerPlant.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/HydroPump.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPump.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/HydroPump.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/HydroPump.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/IdentifiedObject.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/IdentifiedObject.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/IdentifiedObject.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/IdentifiedObject.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/IfdBaseKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/IfdBaseKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/IfdBaseKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/IfdBaseKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Inductance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Inductance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Inductance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Inductance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/InductancePerLength.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/InductancePerLength.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/InductancePerLength.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/InductancePerLength.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/InputSignalKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/InputSignalKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/InputSignalKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/InputSignalKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Integer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Integer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Integer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Integer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Junction.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Junction.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Junction.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Junction.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Length.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Length.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Length.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Length.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Limit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Limit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Limit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Limit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LimitSet.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LimitSet.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LimitSet.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LimitSet.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LimitTypeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LimitTypeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LimitTypeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LimitTypeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Line.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Line.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Line.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Line.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LinearShuntCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LinearShuntCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LinearShuntCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LinearShuntCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadAggregate.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadAggregate.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadAggregate.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadAggregate.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadArea.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadArea.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadArea.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadArea.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadBreakSwitch.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadBreakSwitch.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadBreakSwitch.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadBreakSwitch.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadComposite.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadComposite.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadComposite.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadComposite.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadGenericNonLinear.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadGenericNonLinear.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadGenericNonLinear.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadGenericNonLinear.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadGroup.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadGroup.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadGroup.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadGroup.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadMotor.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadMotor.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadMotor.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadMotor.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadResponseCharacteristic.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadResponseCharacteristic.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadResponseCharacteristic.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadResponseCharacteristic.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadStatic.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadStatic.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadStatic.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadStatic.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/LoadUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/LoadUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/LoadUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Location.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Location.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Location.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Location.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Measurement.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Measurement.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Measurement.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Measurement.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MeasurementValue.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValue.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MeasurementValue.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValue.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MeasurementValueQuality.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValueQuality.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MeasurementValueQuality.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValueQuality.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MeasurementValueSource.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValueSource.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MeasurementValueSource.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MeasurementValueSource.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MechLoad1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechLoad1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MechLoad1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechLoad1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MechanicalLoadDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechanicalLoadDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MechanicalLoadDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechanicalLoadDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MechanicalLoadUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechanicalLoadUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MechanicalLoadUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MechanicalLoadUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Money.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Money.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Money.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Money.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MonthDay.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MonthDay.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MonthDay.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MonthDay.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/MutualCoupling.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MutualCoupling.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/MutualCoupling.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/MutualCoupling.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NonConformLoad.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoad.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NonConformLoad.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoad.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NonConformLoadGroup.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoadGroup.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NonConformLoadGroup.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoadGroup.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NonConformLoadSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoadSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NonConformLoadSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonConformLoadSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NonlinearShuntCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonlinearShuntCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NonlinearShuntCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonlinearShuntCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NonlinearShuntCompensatorPoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonlinearShuntCompensatorPoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NonlinearShuntCompensatorPoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NonlinearShuntCompensatorPoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/NuclearGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NuclearGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/NuclearGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/NuclearGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OperationalLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OperationalLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitDirectionKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitDirectionKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitDirectionKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitDirectionKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitSet.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitSet.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitSet.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitSet.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitType.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitType.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OperationalLimitType.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OperationalLimitType.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OrientationKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OrientationKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OrientationKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OrientationKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcLim2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLim2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcLim2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLim2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcLimIEEE.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimIEEE.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcLimIEEE.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimIEEE.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcLimX1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimX1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcLimX1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimX1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcLimX2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimX2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcLimX2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcLimX2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcitationLimiterDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcitationLimiterDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcitationLimiterDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcitationLimiterDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/OverexcitationLimiterUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcitationLimiterUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/OverexcitationLimiterUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/OverexcitationLimiterUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType1Dynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType1Dynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType1Dynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType1Dynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType1UserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType1UserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType1UserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType1UserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType2Dynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType2Dynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType2Dynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType2Dynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType2UserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType2UserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArControllerType2UserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArControllerType2UserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArType1IEEEPFController.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType1IEEEPFController.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArType1IEEEPFController.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType1IEEEPFController.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArType1IEEEVArController.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType1IEEEVArController.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArType1IEEEVArController.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType1IEEEVArController.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArType2Common1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2Common1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArType2Common1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2Common1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArType2IEEEPFController.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2IEEEPFController.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArType2IEEEPFController.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2IEEEPFController.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PFVArType2IEEEVArController.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2IEEEVArController.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PFVArType2IEEEVArController.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PFVArType2IEEEVArController.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PU.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PU.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PU.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PU.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PerCent.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PerCent.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PerCent.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PerCent.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PerLengthDCLineParameter.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PerLengthDCLineParameter.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PerLengthDCLineParameter.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PerLengthDCLineParameter.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PetersenCoil.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PetersenCoil.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PetersenCoil.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PetersenCoil.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PetersenCoilModeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PetersenCoilModeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PetersenCoilModeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PetersenCoilModeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseCode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseCode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseCode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseCode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChanger.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChanger.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChanger.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChanger.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerAsymmetrical.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerAsymmetrical.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerAsymmetrical.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerAsymmetrical.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerLinear.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerLinear.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerLinear.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerLinear.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerNonLinear.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerNonLinear.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerNonLinear.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerNonLinear.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerSymmetrical.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerSymmetrical.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerSymmetrical.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerSymmetrical.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTable.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTable.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTable.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTable.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTablePoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTablePoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTablePoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTablePoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTabular.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTabular.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PhaseTapChangerTabular.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PhaseTapChangerTabular.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PositionPoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PositionPoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PositionPoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PositionPoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PowerSystemResource.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemResource.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PowerSystemResource.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemResource.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PowerSystemStabilizerDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemStabilizerDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PowerSystemStabilizerDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemStabilizerDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PowerSystemStabilizerUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemStabilizerUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PowerSystemStabilizerUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerSystemStabilizerUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PowerTransformer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerTransformer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PowerTransformer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerTransformer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PowerTransformerEnd.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerTransformerEnd.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PowerTransformerEnd.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PowerTransformerEnd.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PrimitiveBuilder.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PrimitiveBuilder.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PrimitiveBuilder.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PrimitiveBuilder.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ProprietaryParameterDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ProprietaryParameterDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ProprietaryParameterDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ProprietaryParameterDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ProtectedSwitch.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ProtectedSwitch.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ProtectedSwitch.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ProtectedSwitch.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Pss1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Pss1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Pss1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Pss1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Pss2B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss2B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Pss2B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss2B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Pss2ST.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss2ST.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Pss2ST.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss2ST.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Pss5.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss5.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Pss5.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Pss5.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssELIN2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssELIN2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssELIN2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssELIN2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssIEEE1A.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE1A.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssIEEE1A.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE1A.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssIEEE2B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE2B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssIEEE2B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE2B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssIEEE3B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE3B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssIEEE3B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE3B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssIEEE4B.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE4B.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssIEEE4B.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssIEEE4B.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssPTIST1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssPTIST1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssPTIST1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssPTIST1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssPTIST3.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssPTIST3.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssPTIST3.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssPTIST3.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssSB4.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSB4.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssSB4.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSB4.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssSH.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSH.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssSH.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSH.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssSK.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSK.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssSK.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssSK.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/PssWECC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssWECC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/PssWECC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/PssWECC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Quality61850.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Quality61850.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Quality61850.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Quality61850.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RaiseLowerCommand.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RaiseLowerCommand.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RaiseLowerCommand.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RaiseLowerCommand.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RatioTapChanger.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChanger.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RatioTapChanger.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChanger.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RatioTapChangerTable.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChangerTable.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RatioTapChangerTable.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChangerTable.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RatioTapChangerTablePoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChangerTablePoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RatioTapChangerTablePoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RatioTapChangerTablePoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Reactance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Reactance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Reactance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Reactance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ReactiveCapabilityCurve.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReactiveCapabilityCurve.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ReactiveCapabilityCurve.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReactiveCapabilityCurve.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ReactivePower.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReactivePower.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ReactivePower.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReactivePower.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegularIntervalSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegularIntervalSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegularIntervalSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegularIntervalSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegularTimePoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegularTimePoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegularTimePoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegularTimePoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegulatingCondEq.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingCondEq.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegulatingCondEq.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingCondEq.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegulatingControl.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingControl.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegulatingControl.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingControl.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegulatingControlModeKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingControlModeKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegulatingControlModeKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulatingControlModeKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RegulationSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulationSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RegulationSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RegulationSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RemoteInputSignal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RemoteInputSignal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RemoteInputSignal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RemoteInputSignal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RemoteSignalKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RemoteSignalKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RemoteSignalKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RemoteSignalKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ReportingGroup.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReportingGroup.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ReportingGroup.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ReportingGroup.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Resistance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Resistance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Resistance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Resistance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ResistancePerLength.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ResistancePerLength.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ResistancePerLength.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ResistancePerLength.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RotatingMachine.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotatingMachine.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RotatingMachine.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotatingMachine.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RotatingMachineDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotatingMachineDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RotatingMachineDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotatingMachineDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RotationSpeed.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotationSpeed.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RotationSpeed.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotationSpeed.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/RotorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/RotorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/RotorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SVCControlMode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SVCControlMode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SVCControlMode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SVCControlMode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Season.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Season.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Season.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Season.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SeasonDayTypeSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SeasonDayTypeSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SeasonDayTypeSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SeasonDayTypeSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Seconds.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Seconds.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Seconds.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Seconds.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SeriesCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SeriesCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SeriesCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SeriesCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SetPoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SetPoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SetPoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SetPoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ShortCircuitRotorKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ShortCircuitRotorKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ShortCircuitRotorKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ShortCircuitRotorKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ShuntCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ShuntCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ShuntCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ShuntCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Simple_Float.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Simple_Float.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Simple_Float.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Simple_Float.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SolarGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SolarGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SolarGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SolarGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Source.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Source.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Source.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Source.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StateVariablesVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StateVariablesVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StateVariablesVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StateVariablesVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StaticLoadModelKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StaticLoadModelKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StaticLoadModelKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StaticLoadModelKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StaticVarCompensator.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StaticVarCompensator.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StaticVarCompensator.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StaticVarCompensator.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StationSupply.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StationSupply.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StationSupply.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StationSupply.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SteadyStateHypothesisVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SteadyStateHypothesisVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SteadyStateHypothesisVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SteadyStateHypothesisVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/String.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/String.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/String.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/String.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StringMeasurement.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StringMeasurement.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StringMeasurement.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StringMeasurement.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/StringMeasurementValue.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StringMeasurementValue.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/StringMeasurementValue.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/StringMeasurementValue.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SubGeographicalRegion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SubGeographicalRegion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SubGeographicalRegion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SubGeographicalRegion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SubLoadArea.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SubLoadArea.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SubLoadArea.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SubLoadArea.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Substation.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Substation.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Substation.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Substation.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Susceptance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Susceptance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Susceptance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Susceptance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvInjection.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvInjection.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvInjection.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvInjection.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvPowerFlow.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvPowerFlow.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvPowerFlow.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvPowerFlow.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvShuntCompensatorSections.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvShuntCompensatorSections.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvShuntCompensatorSections.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvShuntCompensatorSections.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvStatus.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvStatus.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvStatus.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvStatus.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvTapStep.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvTapStep.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvTapStep.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvTapStep.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SvVoltage.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvVoltage.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SvVoltage.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SvVoltage.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Switch.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Switch.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Switch.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Switch.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SwitchSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SwitchSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SwitchSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SwitchSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachine.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachine.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachine.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachine.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineDetailed.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineDetailed.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineDetailed.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineDetailed.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineEquivalentCircuit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineEquivalentCircuit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineEquivalentCircuit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineEquivalentCircuit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineModelKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineModelKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineModelKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineModelKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineOperatingMode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineOperatingMode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineOperatingMode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineOperatingMode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineSimplified.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineSimplified.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineSimplified.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineSimplified.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineTimeConstantReactance.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineTimeConstantReactance.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineTimeConstantReactance.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineTimeConstantReactance.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/SynchronousMachineUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/SynchronousMachineUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TapChanger.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChanger.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TapChanger.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChanger.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TapChangerControl.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChangerControl.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TapChangerControl.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChangerControl.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TapChangerTablePoint.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChangerTablePoint.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TapChangerTablePoint.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapChangerTablePoint.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TapSchedule.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapSchedule.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TapSchedule.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TapSchedule.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Temperature.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Temperature.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Temperature.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Temperature.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Terminal.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Terminal.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Terminal.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Terminal.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TextDiagramObject.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TextDiagramObject.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TextDiagramObject.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TextDiagramObject.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ThermalGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ThermalGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ThermalGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ThermalGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TieFlow.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TieFlow.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TieFlow.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TieFlow.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TopologicalIsland.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologicalIsland.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TopologicalIsland.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologicalIsland.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TopologicalNode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologicalNode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TopologicalNode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologicalNode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TopologyBoundaryVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologyBoundaryVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TopologyBoundaryVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologyBoundaryVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TopologyVersion.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologyVersion.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TopologyVersion.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TopologyVersion.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TransformerControlMode.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TransformerControlMode.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TransformerControlMode.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TransformerControlMode.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TransformerEnd.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TransformerEnd.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TransformerEnd.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TransformerEnd.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TurbLCFB1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbLCFB1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TurbLCFB1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbLCFB1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TurbineGovernorDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineGovernorDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TurbineGovernorDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineGovernorDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TurbineGovernorUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineGovernorUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TurbineGovernorUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineGovernorUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TurbineLoadControllerDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineLoadControllerDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TurbineLoadControllerDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineLoadControllerDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/TurbineLoadControllerUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineLoadControllerUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/TurbineLoadControllerUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/TurbineLoadControllerUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcLim2Simplified.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLim2Simplified.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcLim2Simplified.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLim2Simplified.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimIEEE1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimIEEE1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimIEEE1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimIEEE1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimIEEE2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimIEEE2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimIEEE2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimIEEE2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimX1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimX1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimX1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimX1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimX2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimX2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcLimX2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcLimX2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcitationLimiterDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcitationLimiterDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcitationLimiterDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcitationLimiterDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnderexcitationLimiterUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcitationLimiterUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnderexcitationLimiterUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnderexcitationLimiterUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnitMultiplier.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnitMultiplier.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnitMultiplier.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnitMultiplier.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/UnitSymbol.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnitSymbol.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/UnitSymbol.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/UnitSymbol.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VAdjIEEE.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VAdjIEEE.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VAdjIEEE.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VAdjIEEE.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VCompIEEEType1.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VCompIEEEType1.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VCompIEEEType1.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VCompIEEEType1.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VCompIEEEType2.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VCompIEEEType2.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VCompIEEEType2.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VCompIEEEType2.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Validity.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Validity.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Validity.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Validity.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ValueAliasSet.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ValueAliasSet.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ValueAliasSet.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ValueAliasSet.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/ValueToAlias.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ValueToAlias.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/ValueToAlias.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/ValueToAlias.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VisibilityLayer.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VisibilityLayer.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VisibilityLayer.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VisibilityLayer.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/Voltage.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Voltage.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/Voltage.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/Voltage.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageAdjusterDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageAdjusterDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageAdjusterDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageAdjusterDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageAdjusterUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageAdjusterUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageAdjusterUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageAdjusterUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageCompensatorDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageCompensatorDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageCompensatorDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageCompensatorDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageCompensatorUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageCompensatorUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageCompensatorUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageCompensatorUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageLevel.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageLevel.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageLevel.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageLevel.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltageLimit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageLimit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltageLimit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltageLimit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VoltagePerReactivePower.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltagePerReactivePower.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VoltagePerReactivePower.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VoltagePerReactivePower.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VolumeFlowRate.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VolumeFlowRate.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VolumeFlowRate.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VolumeFlowRate.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VsCapabilityCurve.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsCapabilityCurve.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VsCapabilityCurve.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsCapabilityCurve.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VsConverter.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsConverter.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VsConverter.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsConverter.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VsPpccControlKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsPpccControlKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VsPpccControlKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsPpccControlKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/VsQpccControlKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsQpccControlKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/VsQpccControlKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/VsQpccControlKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindAeroConstIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindAeroConstIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindAeroConstIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindAeroConstIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindAeroLinearIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindAeroLinearIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindAeroLinearIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindAeroLinearIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContCurrLimIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContCurrLimIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContCurrLimIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContCurrLimIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContPType3IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType3IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContPType3IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType3IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContPType4aIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType4aIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContPType4aIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType4aIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContPType4bIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType4bIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContPType4bIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPType4bIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContPitchAngleIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPitchAngleIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContPitchAngleIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContPitchAngleIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContQIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContQIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContQIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContQIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindContRotorRIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContRotorRIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindContRotorRIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindContRotorRIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindDynamicsLookupTable.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindDynamicsLookupTable.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindDynamicsLookupTable.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindDynamicsLookupTable.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType1IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType1IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType1IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType1IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType2IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType2IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType2IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType2IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3aIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3aIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3aIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3aIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3bIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3bIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenTurbineType3bIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenTurbineType3bIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenType4IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenType4IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenType4IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenType4IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGenUnitKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenUnitKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGenUnitKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGenUnitKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindGeneratingUnit.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGeneratingUnit.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindGeneratingUnit.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindGeneratingUnit.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindLVRTQcontrolModesKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindLVRTQcontrolModesKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindLVRTQcontrolModesKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindLVRTQcontrolModesKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindLookupTableFunctionKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindLookupTableFunctionKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindLookupTableFunctionKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindLookupTableFunctionKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindMechIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindMechIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindMechIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindMechIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPitchContEmulIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPitchContEmulIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPitchContEmulIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPitchContEmulIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPlantDynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantDynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPlantDynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantDynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPlantFreqPcontrolIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantFreqPcontrolIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPlantFreqPcontrolIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantFreqPcontrolIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPlantIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPlantIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPlantReactiveControlIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantReactiveControlIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPlantReactiveControlIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantReactiveControlIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindPlantUserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantUserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindPlantUserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindPlantUserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindProtectionIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindProtectionIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindProtectionIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindProtectionIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindQcontrolModesKind.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindQcontrolModesKind.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindQcontrolModesKind.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindQcontrolModesKind.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType1or2Dynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType1or2Dynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType1or2Dynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType1or2Dynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType1or2IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType1or2IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType1or2IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType1or2IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType3or4Dynamics.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType3or4Dynamics.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType3or4Dynamics.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType3or4Dynamics.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType3or4IEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType3or4IEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType3or4IEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType3or4IEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType4aIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType4aIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType4aIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType4aIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType4bIEC.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType4bIEC.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindTurbineType4bIEC.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindTurbineType4bIEC.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindType1or2UserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindType1or2UserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindType1or2UserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindType1or2UserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindType3or4UserDefined.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindType3or4UserDefined.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindType3or4UserDefined.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindType3or4UserDefined.java
diff --git a/CGMES_2.4.15_27JAN2020/cim4j/WindingConnection.java b/CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindingConnection.java
similarity index 100%
rename from CGMES_2.4.15_27JAN2020/cim4j/WindingConnection.java
rename to CGMES_2.4.15_27JAN2020/src/main/java/cim4j/WindingConnection.java
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..9cd4fd5
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8" ?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
+
+    <groupId>org.lfenergy.sogno</groupId>
+    <artifactId>cim4j-parent</artifactId>
+    <version>0.1.0</version>
+    <packaging>pom</packaging>
+
+    <name>Java classes for CIM / CGMES</name>
+    <url>https://github.com/sogno-platform/cim4j</url>
+
+    <licenses>
+        <license>
+            <name>Apache-2.0</name>
+            <url>https://www.apache.org/licenses/LICENSE-2.0.txt</url>
+        </license>
+    </licenses>
+
+    <modules>
+        <module>CGMES_2.4.15_27JAN2020</module>
+    </modules>
+
+    <distributionManagement>
+        <repository>
+            <id>github</id>
+            <name>GitHub sogno-platform Apache Maven Packages</name>
+            <url>https://maven.pkg.github.com/sogno-platform/cim4j/</url>
+        </repository>
+    </distributionManagement>
+
+    <properties>
+        <maven.compiler.release>11</maven.compiler.release>
+        <maven.compiler.source>11</maven.compiler.source>
+        <maven.compiler.target>11</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <!-- Use cim4j as library downloaded from GitHub Maven Packages repository     -->
+    <!-- Personal access token with read:packages is needed to use GitHub Packages -->
+    <!-- (generated on the developer settings page and added to settings.xml)      -->
+    <!--
+    <repositories>
+        <repository>
+            <id>github</id>
+            <url>https://maven.pkg.github.com/sogno-platform/cim4j/</url>
+            <snapshots>
+                <enabled>true</enabled>
+            </snapshots>
+        </repository>
+    </repositories>
+    -->
+</project>