From 3ca5d7c1c1c67083ab323f986d0b038ccb7d7e50 Mon Sep 17 00:00:00 2001
From: Stefan Herrnleben <s.herrnleben@syslex.de>
Date: Thu, 20 Jul 2017 14:12:24 +0200
Subject: [PATCH] migrated to to eclipse directory structure caused on
 compilation problems with eclipse

---
 tools.descartes.dni.adaptation/model/DNIMM3AP.xcore    |  4 ++--
 tools.descartes.dni.adaptation/pom.xml                 |  2 ++
 .../dni/dnimm3ap/AdaptableEndPerformance.java          |  0
 .../dnimm3ap/AdaptableEndPerformanceRepository.java    |  0
 .../dni/dnimm3ap/AdaptableIntermediatePerformance.java |  0
 .../AdaptableIntermediatePerformanceRepository.java    |  0
 .../tools/descartes/dni/dnimm3ap/AdaptableLink.java    |  0
 .../dni/dnimm3ap/AdaptableLinkPerformance.java         |  0
 .../dnimm3ap/AdaptableLinkPerformanceRepository.java   |  0
 .../dni/dnimm3ap/AdaptableLinkRepository.java          |  0
 .../dni/dnimm3ap/AdaptableNetworkInterface.java        |  0
 .../dnimm3ap/AdaptableNetworkInterfacePerformance.java |  0
 ...AdaptableNetworkInterfacePerformanceRepository.java |  0
 .../dnimm3ap/AdaptableNetworkInterfaceRepository.java  |  0
 .../tools/descartes/dni/dnimm3ap/AdaptableNode.java    |  0
 .../dni/dnimm3ap/AdaptableNodeRepository.java          |  0
 .../dni/dnimm3ap/AdaptableSdnNodePerformance.java      |  0
 .../AdaptableSdnNodePerformanceRepository.java         |  0
 .../tools/descartes/dni/dnimm3ap/AdaptationGroups.java |  0
 .../tools/descartes/dni/dnimm3ap/AdaptationPoints.java |  0
 .../descartes/dni/dnimm3ap/AdaptationRepositories.java |  0
 .../dni/dnimm3ap/AlternativeConstantLong.java          |  0
 .../dnimm3ap/AlternativeConstantLongVariableSet.java   |  0
 .../dni/dnimm3ap/AlternativeParameterSet.java          |  0
 .../descartes/dni/dnimm3ap/AlternativeVariable.java    |  0
 .../descartes/dni/dnimm3ap/AlternativeVariableSet.java |  0
 .../tools/descartes/dni/dnimm3ap/DNIAPFactory.java     |  0
 .../tools/descartes/dni/dnimm3ap/DNIAPPackage.java     |  2 +-
 .../tools/descartes/dni/dnimm3ap/IAdaptableEntity.java |  0
 .../dni/dnimm3ap/IAdaptableEntityRepository.java       |  0
 .../dni/dnimm3ap/IAdaptableGroupableEntity.java        |  0
 .../tools/descartes/dni/dnimm3ap/IAdaptationGroup.java |  0
 .../descartes/dni/dnimm3ap/LinkAdaptationGroup.java    |  0
 .../descartes/dni/dnimm3ap/NodeAdaptationGroup.java    |  0
 .../dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java |  0
 .../impl/AdaptableEndPerformanceRepositoryImpl.java    |  0
 .../impl/AdaptableIntermediatePerformanceImpl.java     |  0
 ...AdaptableIntermediatePerformanceRepositoryImpl.java |  0
 .../descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java |  0
 .../dnimm3ap/impl/AdaptableLinkPerformanceImpl.java    |  0
 .../impl/AdaptableLinkPerformanceRepositoryImpl.java   |  0
 .../dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java |  0
 .../dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java   |  0
 .../impl/AdaptableNetworkInterfacePerformanceImpl.java |  0
 ...tableNetworkInterfacePerformanceRepositoryImpl.java |  0
 .../impl/AdaptableNetworkInterfaceRepositoryImpl.java  |  0
 .../descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java |  0
 .../dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java |  0
 .../dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java |  0
 .../AdaptableSdnNodePerformanceRepositoryImpl.java     |  0
 .../dni/dnimm3ap/impl/AdaptationGroupsImpl.java        |  0
 .../dni/dnimm3ap/impl/AdaptationPointsImpl.java        |  0
 .../dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java  |  0
 .../dni/dnimm3ap/impl/AlternativeConstantLongImpl.java |  0
 .../impl/AlternativeConstantLongVariableSetImpl.java   |  0
 .../dni/dnimm3ap/impl/AlternativeVariableImpl.java     |  0
 .../dni/dnimm3ap/impl/AlternativeVariableSetImpl.java  |  0
 .../descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java  |  0
 .../descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java  |  0
 .../dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java     |  0
 .../dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java     |  0
 .../presentation/DNIAPActionBarContributor.java        |  0
 .../dni/dnimm3ap/presentation/DNIAPEditor.java         |  0
 .../dni/dnimm3ap/presentation/DNIAPModelWizard.java    |  0
 .../provider/AdaptableEndPerformanceItemProvider.java  |  0
 .../AdaptableEndPerformanceRepositoryItemProvider.java |  0
 .../AdaptableIntermediatePerformanceItemProvider.java  |  0
 ...eIntermediatePerformanceRepositoryItemProvider.java |  0
 .../dnimm3ap/provider/AdaptableLinkItemProvider.java   |  0
 .../provider/AdaptableLinkPerformanceItemProvider.java |  0
 ...AdaptableLinkPerformanceRepositoryItemProvider.java |  0
 .../provider/AdaptableLinkRepositoryItemProvider.java  |  0
 .../AdaptableNetworkInterfaceItemProvider.java         |  0
 ...aptableNetworkInterfacePerformanceItemProvider.java |  0
 ...workInterfacePerformanceRepositoryItemProvider.java |  0
 ...daptableNetworkInterfaceRepositoryItemProvider.java |  0
 .../dnimm3ap/provider/AdaptableNodeItemProvider.java   |  0
 .../provider/AdaptableNodeRepositoryItemProvider.java  |  0
 .../AdaptableSdnNodePerformanceItemProvider.java       |  0
 ...ptableSdnNodePerformanceRepositoryItemProvider.java |  0
 .../provider/AdaptationGroupsItemProvider.java         |  0
 .../provider/AdaptationPointsItemProvider.java         |  0
 .../provider/AdaptationRepositoriesItemProvider.java   |  0
 .../provider/AlternativeConstantLongItemProvider.java  |  0
 ...AlternativeConstantLongVariableSetItemProvider.java | 10 +++++-----
 .../provider/AlternativeVariableItemProvider.java      |  0
 .../provider/AlternativeVariableSetItemProvider.java   | 10 +++++-----
 .../provider/DNIAPItemProviderAdapterFactory.java      |  0
 .../dni/dnimm3ap/provider/Dnimm3apEditPlugin.java      |  0
 .../provider/LinkAdaptationGroupItemProvider.java      |  0
 .../provider/NodeAdaptationGroupItemProvider.java      |  0
 .../dni/dnimm3ap/util/DNIAPAdapterFactory.java         |  0
 .../tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java |  0
 tools.descartes.dni.core/model/DNIMM3.xcore            |  4 ++--
 tools.descartes.dni.core/pom.xml                       |  2 ++
 .../test/resources => resources-test}/scenario0A.dni   |  0
 .../tools/descartes/dni/dnimm3/tools/ParserTest.java   |  4 ++--
 .../tools/descartes/dni/dnimm3/AbstractAction.java     |  0
 .../tools/descartes/dni/dnimm3/AddressableEntity.java  |  0
 .../tools/descartes/dni/dnimm3/BranchAction.java       |  0
 .../java => }/tools/descartes/dni/dnimm3/Common.java   |  0
 .../descartes/dni/dnimm3/CommunicatingApplication.java |  0
 .../descartes/dni/dnimm3/ConstantDoubleVariable.java   |  0
 .../descartes/dni/dnimm3/ConstantLongVariable.java     |  0
 .../tools/descartes/dni/dnimm3/DNIFactory.java         |  0
 .../tools/descartes/dni/dnimm3/DNIPackage.java         |  2 +-
 .../java => }/tools/descartes/dni/dnimm3/DNIUnit.java  |  0
 .../java => }/tools/descartes/dni/dnimm3/DataUnit.java |  0
 .../tools/descartes/dni/dnimm3/Dependency.java         |  0
 .../tools/descartes/dni/dnimm3/Direction.java          |  0
 .../tools/descartes/dni/dnimm3/DiscreteFunction.java   |  0
 .../java => }/tools/descartes/dni/dnimm3/End.java      |  0
 .../tools/descartes/dni/dnimm3/EndPerformance.java     |  0
 .../tools/descartes/dni/dnimm3/EndPerformanceType.java |  0
 .../java => }/tools/descartes/dni/dnimm3/Entity.java   |  0
 .../tools/descartes/dni/dnimm3/EntityAddress.java      |  0
 .../tools/descartes/dni/dnimm3/EntityTypes.java        |  0
 .../descartes/dni/dnimm3/ExponentialFunction.java      |  0
 .../tools/descartes/dni/dnimm3/FloatCoordinate.java    |  0
 .../java => }/tools/descartes/dni/dnimm3/Flow.java     |  0
 .../tools/descartes/dni/dnimm3/FlowRoute.java          |  0
 .../tools/descartes/dni/dnimm3/FlowTraffic.java        |  0
 .../java => }/tools/descartes/dni/dnimm3/Function.java |  0
 .../tools/descartes/dni/dnimm3/GenericFlowTraffic.java |  0
 .../tools/descartes/dni/dnimm3/GenericWorkload.java    |  0
 .../java => }/tools/descartes/dni/dnimm3/Hop.java      |  0
 .../java => }/tools/descartes/dni/dnimm3/IType.java    |  0
 .../tools/descartes/dni/dnimm3/ITypedEntity.java       |  0
 .../tools/descartes/dni/dnimm3/Identifier.java         |  0
 .../tools/descartes/dni/dnimm3/Intermediate.java       |  0
 .../descartes/dni/dnimm3/IntermediatePerformance.java  |  0
 .../dni/dnimm3/IntermediatePerformanceType.java        |  0
 .../java => }/tools/descartes/dni/dnimm3/Link.java     |  0
 .../descartes/dni/dnimm3/LinkPerformanceType.java      |  0
 .../java => }/tools/descartes/dni/dnimm3/LinkType.java |  0
 .../tools/descartes/dni/dnimm3/LoopAction.java         |  0
 .../tools/descartes/dni/dnimm3/NamedElement.java       |  0
 .../descartes/dni/dnimm3/NetworkConfiguration.java     |  0
 .../descartes/dni/dnimm3/NetworkInfrastructure.java    |  0
 .../tools/descartes/dni/dnimm3/NetworkInterface.java   |  0
 .../dni/dnimm3/NetworkInterfacePerformanceType.java    |  0
 .../descartes/dni/dnimm3/NetworkInterfaceType.java     |  0
 .../tools/descartes/dni/dnimm3/NetworkProtocol.java    |  0
 .../tools/descartes/dni/dnimm3/NetworkStructure.java   |  0
 .../tools/descartes/dni/dnimm3/NetworkTraffic.java     |  0
 .../java => }/tools/descartes/dni/dnimm3/Node.java     |  0
 .../java => }/tools/descartes/dni/dnimm3/NodeType.java |  0
 .../tools/descartes/dni/dnimm3/PerformanceLink.java    |  0
 .../dni/dnimm3/PerformanceNetworkInterface.java        |  0
 .../tools/descartes/dni/dnimm3/PerformanceSdnNode.java |  0
 .../descartes/dni/dnimm3/PerformanceSpecification.java |  0
 .../tools/descartes/dni/dnimm3/ProtocolLayer.java      |  0
 .../tools/descartes/dni/dnimm3/ProtocolStack.java      |  0
 .../descartes/dni/dnimm3/ProtocolsRepository.java      |  0
 .../tools/descartes/dni/dnimm3/RandomVariable.java     |  0
 .../java => }/tools/descartes/dni/dnimm3/Route.java    |  0
 .../tools/descartes/dni/dnimm3/RoutesRepository.java   |  0
 .../java => }/tools/descartes/dni/dnimm3/SDN.java      |  0
 .../tools/descartes/dni/dnimm3/SdnControlFlow.java     |  0
 .../tools/descartes/dni/dnimm3/SdnController.java      |  0
 .../descartes/dni/dnimm3/SdnControllerApplication.java |  0
 .../tools/descartes/dni/dnimm3/SdnFlowRule.java        |  0
 .../descartes/dni/dnimm3/SdnNodePerformanceType.java   |  0
 .../tools/descartes/dni/dnimm3/SequenceAction.java     |  0
 .../java => }/tools/descartes/dni/dnimm3/Speed.java    |  0
 .../tools/descartes/dni/dnimm3/SpeedUnit.java          |  0
 .../tools/descartes/dni/dnimm3/StartAction.java        |  0
 .../tools/descartes/dni/dnimm3/StopAction.java         |  0
 .../java => }/tools/descartes/dni/dnimm3/Time.java     |  0
 .../java => }/tools/descartes/dni/dnimm3/TimeUnit.java |  0
 .../tools/descartes/dni/dnimm3/TrafficSource.java      |  0
 .../tools/descartes/dni/dnimm3/TransmitAction.java     |  0
 .../tools/descartes/dni/dnimm3/UnitPrefix.java         |  0
 .../java => }/tools/descartes/dni/dnimm3/Variable.java |  0
 .../tools/descartes/dni/dnimm3/WaitAction.java         |  0
 .../java => }/tools/descartes/dni/dnimm3/Workload.java |  0
 .../descartes/dni/dnimm3/impl/BranchActionImpl.java    |  0
 .../tools/descartes/dni/dnimm3/impl/CommonImpl.java    |  0
 .../dni/dnimm3/impl/CommunicatingApplicationImpl.java  |  0
 .../dni/dnimm3/impl/ConstantDoubleVariableImpl.java    |  0
 .../dni/dnimm3/impl/ConstantLongVariableImpl.java      |  0
 .../descartes/dni/dnimm3/impl/DNIFactoryImpl.java      |  0
 .../descartes/dni/dnimm3/impl/DNIPackageImpl.java      |  0
 .../tools/descartes/dni/dnimm3/impl/DataUnitImpl.java  |  0
 .../tools/descartes/dni/dnimm3/impl/DirectionImpl.java |  0
 .../dni/dnimm3/impl/DiscreteFunctionImpl.java          |  0
 .../tools/descartes/dni/dnimm3/impl/EndImpl.java       |  0
 .../descartes/dni/dnimm3/impl/EndPerformanceImpl.java  |  0
 .../dni/dnimm3/impl/EndPerformanceTypeImpl.java        |  0
 .../descartes/dni/dnimm3/impl/EntityAddressImpl.java   |  0
 .../descartes/dni/dnimm3/impl/EntityTypesImpl.java     |  0
 .../dni/dnimm3/impl/ExponentialFunctionImpl.java       |  0
 .../descartes/dni/dnimm3/impl/FloatCoordinateImpl.java |  0
 .../tools/descartes/dni/dnimm3/impl/FlowImpl.java      |  0
 .../tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java |  0
 .../descartes/dni/dnimm3/impl/FlowTrafficImpl.java     |  0
 .../dni/dnimm3/impl/GenericFlowTrafficImpl.java        |  0
 .../descartes/dni/dnimm3/impl/GenericWorkloadImpl.java |  0
 .../tools/descartes/dni/dnimm3/impl/HopImpl.java       |  0
 .../descartes/dni/dnimm3/impl/IdentifierImpl.java      |  0
 .../descartes/dni/dnimm3/impl/IntermediateImpl.java    |  0
 .../dni/dnimm3/impl/IntermediatePerformanceImpl.java   |  0
 .../dnimm3/impl/IntermediatePerformanceTypeImpl.java   |  0
 .../tools/descartes/dni/dnimm3/impl/LinkImpl.java      |  0
 .../dni/dnimm3/impl/LinkPerformanceTypeImpl.java       |  0
 .../tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java  |  0
 .../descartes/dni/dnimm3/impl/LoopActionImpl.java      |  0
 .../dni/dnimm3/impl/NetworkConfigurationImpl.java      |  0
 .../dni/dnimm3/impl/NetworkInfrastructureImpl.java     |  0
 .../dni/dnimm3/impl/NetworkInterfaceImpl.java          |  0
 .../impl/NetworkInterfacePerformanceTypeImpl.java      |  0
 .../dni/dnimm3/impl/NetworkInterfaceTypeImpl.java      |  0
 .../descartes/dni/dnimm3/impl/NetworkProtocolImpl.java |  0
 .../dni/dnimm3/impl/NetworkStructureImpl.java          |  0
 .../descartes/dni/dnimm3/impl/NetworkTrafficImpl.java  |  0
 .../tools/descartes/dni/dnimm3/impl/NodeImpl.java      |  0
 .../tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java  |  0
 .../descartes/dni/dnimm3/impl/PerformanceLinkImpl.java |  0
 .../dnimm3/impl/PerformanceNetworkInterfaceImpl.java   |  0
 .../dni/dnimm3/impl/PerformanceSdnNodeImpl.java        |  0
 .../descartes/dni/dnimm3/impl/ProtocolLayerImpl.java   |  0
 .../descartes/dni/dnimm3/impl/ProtocolStackImpl.java   |  0
 .../dni/dnimm3/impl/ProtocolsRepositoryImpl.java       |  0
 .../descartes/dni/dnimm3/impl/RandomVariableImpl.java  |  0
 .../tools/descartes/dni/dnimm3/impl/RouteImpl.java     |  0
 .../dni/dnimm3/impl/RoutesRepositoryImpl.java          |  0
 .../tools/descartes/dni/dnimm3/impl/SDNImpl.java       |  0
 .../descartes/dni/dnimm3/impl/SdnControlFlowImpl.java  |  0
 .../dni/dnimm3/impl/SdnControllerApplicationImpl.java  |  0
 .../descartes/dni/dnimm3/impl/SdnControllerImpl.java   |  0
 .../descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java     |  0
 .../dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java    |  0
 .../descartes/dni/dnimm3/impl/SequenceActionImpl.java  |  0
 .../tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java |  0
 .../descartes/dni/dnimm3/impl/StartActionImpl.java     |  0
 .../descartes/dni/dnimm3/impl/StopActionImpl.java      |  0
 .../tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java  |  0
 .../descartes/dni/dnimm3/impl/TrafficSourceImpl.java   |  0
 .../descartes/dni/dnimm3/impl/TransmitActionImpl.java  |  0
 .../descartes/dni/dnimm3/impl/WaitActionImpl.java      |  0
 .../dnimm3/presentation/DNIActionBarContributor.java   |  0
 .../descartes/dni/dnimm3/presentation/DNIEditor.java   |  0
 .../dni/dnimm3/presentation/DNIModelWizard.java        |  0
 .../dni/dnimm3/provider/BranchActionItemProvider.java  |  0
 .../dni/dnimm3/provider/CommonItemProvider.java        |  0
 .../provider/CommunicatingApplicationItemProvider.java |  0
 .../provider/ConstantDoubleVariableItemProvider.java   |  0
 .../provider/ConstantLongVariableItemProvider.java     |  0
 .../dnimm3/provider/DNIItemProviderAdapterFactory.java |  0
 .../dni/dnimm3/provider/DataUnitItemProvider.java      |  0
 .../dni/dnimm3/provider/DirectionItemProvider.java     |  0
 .../dnimm3/provider/DiscreteFunctionItemProvider.java  |  0
 .../dni/dnimm3/provider/Dnimm3EditPlugin.java          |  0
 .../descartes/dni/dnimm3/provider/EndItemProvider.java |  0
 .../dnimm3/provider/EndPerformanceItemProvider.java    |  0
 .../provider/EndPerformanceTypeItemProvider.java       |  0
 .../dni/dnimm3/provider/EntityAddressItemProvider.java |  0
 .../dni/dnimm3/provider/EntityTypesItemProvider.java   |  0
 .../provider/ExponentialFunctionItemProvider.java      |  0
 .../dnimm3/provider/FloatCoordinateItemProvider.java   |  0
 .../dni/dnimm3/provider/FlowItemProvider.java          |  0
 .../dni/dnimm3/provider/FlowRouteItemProvider.java     |  0
 .../dni/dnimm3/provider/FlowTrafficItemProvider.java   |  0
 .../provider/GenericFlowTrafficItemProvider.java       |  0
 .../dnimm3/provider/GenericWorkloadItemProvider.java   |  0
 .../descartes/dni/dnimm3/provider/HopItemProvider.java |  0
 .../dni/dnimm3/provider/IdentifierItemProvider.java    |  0
 .../dni/dnimm3/provider/IntermediateItemProvider.java  |  0
 .../provider/IntermediatePerformanceItemProvider.java  |  0
 .../IntermediatePerformanceTypeItemProvider.java       |  0
 .../dni/dnimm3/provider/LinkItemProvider.java          |  0
 .../provider/LinkPerformanceTypeItemProvider.java      |  0
 .../dni/dnimm3/provider/LinkTypeItemProvider.java      |  0
 .../dni/dnimm3/provider/LoopActionItemProvider.java    |  0
 .../provider/NetworkConfigurationItemProvider.java     |  0
 .../provider/NetworkInfrastructureItemProvider.java    |  0
 .../dnimm3/provider/NetworkInterfaceItemProvider.java  |  0
 .../NetworkInterfacePerformanceTypeItemProvider.java   |  0
 .../provider/NetworkInterfaceTypeItemProvider.java     |  0
 .../dnimm3/provider/NetworkProtocolItemProvider.java   |  0
 .../dnimm3/provider/NetworkStructureItemProvider.java  |  0
 .../dnimm3/provider/NetworkTrafficItemProvider.java    |  0
 .../dni/dnimm3/provider/NodeItemProvider.java          |  0
 .../dni/dnimm3/provider/NodeTypeItemProvider.java      |  0
 .../dnimm3/provider/PerformanceLinkItemProvider.java   |  0
 .../PerformanceNetworkInterfaceItemProvider.java       |  0
 .../provider/PerformanceSdnNodeItemProvider.java       |  0
 .../dni/dnimm3/provider/ProtocolLayerItemProvider.java |  0
 .../dni/dnimm3/provider/ProtocolStackItemProvider.java |  0
 .../provider/ProtocolsRepositoryItemProvider.java      |  0
 .../dnimm3/provider/RandomVariableItemProvider.java    |  0
 .../dni/dnimm3/provider/RouteItemProvider.java         |  0
 .../dnimm3/provider/RoutesRepositoryItemProvider.java  |  0
 .../descartes/dni/dnimm3/provider/SDNItemProvider.java |  0
 .../dnimm3/provider/SdnControlFlowItemProvider.java    |  0
 .../provider/SdnControllerApplicationItemProvider.java |  0
 .../dni/dnimm3/provider/SdnControllerItemProvider.java |  0
 .../dni/dnimm3/provider/SdnFlowRuleItemProvider.java   |  0
 .../provider/SdnNodePerformanceTypeItemProvider.java   |  0
 .../dnimm3/provider/SequenceActionItemProvider.java    |  0
 .../dni/dnimm3/provider/SpeedUnitItemProvider.java     |  0
 .../dni/dnimm3/provider/StartActionItemProvider.java   |  0
 .../dni/dnimm3/provider/StopActionItemProvider.java    |  0
 .../dni/dnimm3/provider/TimeUnitItemProvider.java      |  0
 .../dni/dnimm3/provider/TrafficSourceItemProvider.java |  0
 .../dnimm3/provider/TransmitActionItemProvider.java    |  0
 .../dni/dnimm3/provider/WaitActionItemProvider.java    |  0
 .../tools/descartes/dni/dnimm3/tools/Parser.java       |  0
 .../descartes/dni/dnimm3/util/DNIAdapterFactory.java   |  0
 .../tools/descartes/dni/dnimm3/util/DNISwitch.java     |  0
 310 files changed, 22 insertions(+), 18 deletions(-)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableEndPerformance.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableEndPerformanceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformance.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformanceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableLink.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformance.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformanceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableLinkRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformance.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformanceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfaceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNode.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableNodeRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformanceRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptationGroups.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptationPoints.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AlternativeConstantLong.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AlternativeConstantLongVariableSet.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AlternativeVariable.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/AlternativeVariableSet.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/DNIAPFactory.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/DNIAPPackage.java (99%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/IAdaptableEntity.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/IAdaptableEntityRepository.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/IAdaptableGroupableEntity.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/IAdaptationGroup.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceRepositoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptationPointsImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/presentation/DNIAPActionBarContributor.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/presentation/DNIAPEditor.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/presentation/DNIAPModelWizard.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptationGroupsItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptationPointsItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AdaptationRepositoriesItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/DNIAPItemProviderAdapterFactory.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/Dnimm3apEditPlugin.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/LinkAdaptationGroupItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/provider/NodeAdaptationGroupItemProvider.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/util/DNIAPAdapterFactory.java (100%)
 rename tools.descartes.dni.adaptation/src/{main/java => }/tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java (100%)
 rename tools.descartes.dni.core/{src/test/resources => resources-test}/scenario0A.dni (100%)
 rename tools.descartes.dni.core/{src/test/java => src-test}/tools/descartes/dni/dnimm3/tools/ParserTest.java (92%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/AbstractAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/AddressableEntity.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/BranchAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Common.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/CommunicatingApplication.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ConstantDoubleVariable.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ConstantLongVariable.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/DNIFactory.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/DNIPackage.java (99%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/DNIUnit.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/DataUnit.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Dependency.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Direction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/DiscreteFunction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/End.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/EndPerformance.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/EndPerformanceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Entity.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/EntityAddress.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/EntityTypes.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ExponentialFunction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/FloatCoordinate.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Flow.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/FlowRoute.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/FlowTraffic.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Function.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/GenericFlowTraffic.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/GenericWorkload.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Hop.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/IType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ITypedEntity.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Identifier.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Intermediate.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/IntermediatePerformance.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Link.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/LinkPerformanceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/LinkType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/LoopAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NamedElement.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkConfiguration.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkInfrastructure.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkInterface.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkInterfaceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkProtocol.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkStructure.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NetworkTraffic.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Node.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/NodeType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/PerformanceLink.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/PerformanceSdnNode.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/PerformanceSpecification.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ProtocolLayer.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ProtocolStack.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/ProtocolsRepository.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/RandomVariable.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Route.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/RoutesRepository.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SDN.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SdnControlFlow.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SdnController.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SdnControllerApplication.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SdnFlowRule.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SequenceAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Speed.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/SpeedUnit.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/StartAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/StopAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Time.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/TimeUnit.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/TrafficSource.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/TransmitAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/UnitPrefix.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Variable.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/WaitAction.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/Workload.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/CommonImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ConstantDoubleVariableImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ConstantLongVariableImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/DNIFactoryImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/DataUnitImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/DirectionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/EndImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/EndPerformanceImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/EntityAddressImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ExponentialFunctionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/FloatCoordinateImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/FlowImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/FlowTrafficImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/GenericFlowTrafficImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/HopImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/IdentifierImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/IntermediateImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/LinkImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/LoopActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkInfrastructureImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkProtocolImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NodeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/PerformanceLinkImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/PerformanceNetworkInterfaceImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/PerformanceSdnNodeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ProtocolLayerImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/RandomVariableImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/RouteImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SDNImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SdnControlFlowImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SdnControllerApplicationImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/StartActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/StopActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/TransmitActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/impl/WaitActionImpl.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/presentation/DNIActionBarContributor.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/presentation/DNIEditor.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/presentation/DNIModelWizard.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/BranchActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/CommonItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/CommunicatingApplicationItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ConstantDoubleVariableItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ConstantLongVariableItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/DNIItemProviderAdapterFactory.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/DataUnitItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/DirectionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/DiscreteFunctionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/Dnimm3EditPlugin.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/EndItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/EndPerformanceItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/EndPerformanceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/EntityAddressItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/EntityTypesItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ExponentialFunctionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/FloatCoordinateItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/FlowItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/FlowRouteItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/FlowTrafficItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/GenericFlowTrafficItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/GenericWorkloadItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/HopItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/IdentifierItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/IntermediateItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/LinkItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/LinkPerformanceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/LinkTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/LoopActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkConfigurationItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkInfrastructureItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkInterfaceItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkInterfacePerformanceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkInterfaceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkProtocolItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkStructureItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NetworkTrafficItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NodeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/NodeTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/PerformanceLinkItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/PerformanceNetworkInterfaceItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/PerformanceSdnNodeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ProtocolLayerItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ProtocolStackItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/ProtocolsRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/RandomVariableItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/RouteItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/RoutesRepositoryItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SDNItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SdnControlFlowItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SdnControllerApplicationItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SdnControllerItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SdnFlowRuleItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SdnNodePerformanceTypeItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SequenceActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/SpeedUnitItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/StartActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/StopActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/TimeUnitItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/TrafficSourceItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/TransmitActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/provider/WaitActionItemProvider.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/tools/Parser.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/util/DNIAdapterFactory.java (100%)
 rename tools.descartes.dni.core/src/{main/java => }/tools/descartes/dni/dnimm3/util/DNISwitch.java (100%)

diff --git a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
index cea185d5..f19a93fd 100644
--- a/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
+++ b/tools.descartes.dni.adaptation/model/DNIMM3AP.xcore
@@ -1,6 +1,6 @@
 @Ecore(nsURI="http://descartes.tools/dni-adaptation-metamodel-3.1")
-@GenModel(modelDirectory="/tools.descartes.dni.adaptation/src/main/java", editDirectory="/tools.descartes.dni.adaptation/src/main/java",
-	editorDirectory="/tools.descartes.dni.adaptation/src/main/java", fileExtensions="dniap", prefix="DNIAP")
+@GenModel(modelDirectory="/tools.descartes.dni.adaptation/src", editDirectory="/tools.descartes.dni.adaptation/src",
+	editorDirectory="/tools.descartes.dni.adaptation/src", fileExtensions="dniap", prefix="DNIAP")
 package tools.descartes.dni.dnimm3ap
 
 //
diff --git a/tools.descartes.dni.adaptation/pom.xml b/tools.descartes.dni.adaptation/pom.xml
index 1a3e4e64..3eda09db 100644
--- a/tools.descartes.dni.adaptation/pom.xml
+++ b/tools.descartes.dni.adaptation/pom.xml
@@ -33,6 +33,8 @@
 	</repositories>
 
 	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>src-test</testSourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableEndPerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableEndPerformance.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableEndPerformance.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableEndPerformance.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableEndPerformanceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableEndPerformanceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableEndPerformanceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableEndPerformanceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformance.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformance.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformance.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformanceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformanceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformanceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableIntermediatePerformanceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLink.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLink.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLink.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformance.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformance.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformance.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformanceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformanceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformanceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkPerformanceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableLinkRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableLinkRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterface.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformance.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformance.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformance.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformanceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformanceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformanceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfacePerformanceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfaceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfaceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfaceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNetworkInterfaceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNode.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNode.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNode.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNodeRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNodeRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableNodeRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableNodeRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformance.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformanceRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformanceRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformanceRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptableSdnNodePerformanceRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationGroups.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationGroups.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationPoints.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationPoints.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AdaptationRepositories.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeConstantLong.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeConstantLong.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeConstantLong.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeConstantLong.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeConstantLongVariableSet.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeConstantLongVariableSet.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeConstantLongVariableSet.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeConstantLongVariableSet.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeParameterSet.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeVariable.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeVariable.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeVariable.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeVariable.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeVariableSet.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeVariableSet.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/AlternativeVariableSet.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/AlternativeVariableSet.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/DNIAPFactory.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPFactory.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/DNIAPFactory.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPFactory.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/DNIAPPackage.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
similarity index 99%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
index 91daeb71..f5604c36 100644
--- a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/DNIAPPackage.java
@@ -23,7 +23,7 @@ import tools.descartes.dni.dnimm3.DNIPackage;
  * <!-- end-user-doc -->
  * @see tools.descartes.dni.dnimm3ap.DNIAPFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src/main/java' editDirectory='/tools.descartes.dni.adaptation/src/main/java' editorDirectory='/tools.descartes.dni.adaptation/src/main/java' fileExtensions='dniap' prefix='DNIAP' basePackage='tools.descartes.dni'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.adaptation/src' editDirectory='/tools.descartes.dni.adaptation/src' editorDirectory='/tools.descartes.dni.adaptation/src' fileExtensions='dniap' prefix='DNIAP' basePackage='tools.descartes.dni'"
  * @generated
  */
 public interface DNIAPPackage extends EPackage {
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableEntity.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableEntity.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableEntity.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableEntity.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableEntityRepository.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableEntityRepository.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableEntityRepository.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableEntityRepository.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableGroupableEntity.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableGroupableEntity.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptableGroupableEntity.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptableGroupableEntity.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptationGroup.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/IAdaptationGroup.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/IAdaptationGroup.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/LinkAdaptationGroup.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/NodeAdaptationGroup.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableEndPerformanceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableIntermediatePerformanceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkPerformanceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableLinkRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfacePerformanceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNetworkInterfaceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableNodeRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceRepositoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceRepositoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptableSdnNodePerformanceRepositoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationGroupsImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationPointsImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationPointsImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationPointsImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationPointsImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AdaptationRepositoriesImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeConstantLongVariableSetImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/AlternativeVariableSetImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPFactoryImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/DNIAPPackageImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/LinkAdaptationGroupImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/impl/NodeAdaptationGroupImpl.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPActionBarContributor.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPActionBarContributor.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPActionBarContributor.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPActionBarContributor.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPEditor.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPEditor.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPEditor.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPEditor.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPModelWizard.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPModelWizard.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/presentation/DNIAPModelWizard.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/presentation/DNIAPModelWizard.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableEndPerformanceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableIntermediatePerformanceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkPerformanceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableLinkRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfacePerformanceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNetworkInterfaceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableNodeRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceRepositoryItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceRepositoryItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptableSdnNodePerformanceRepositoryItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationGroupsItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationGroupsItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationGroupsItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationGroupsItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationPointsItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationPointsItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationPointsItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationPointsItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationRepositoriesItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationRepositoriesItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AdaptationRepositoriesItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AdaptationRepositoriesItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java
index 1ac19d05..25ff9eae 100644
--- a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeConstantLongVariableSetItemProvider.java
@@ -552,6 +552,11 @@ public class AlternativeConstantLongVariableSetItemProvider extends AlternativeC
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 DNIFactory.eINSTANCE.createLinkPerformanceType()));
 
+		newChildDescriptors.add
+			(createChildParameter
+				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
+				 EcoreFactory.eINSTANCE.createEObject()));
+
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
@@ -587,11 +592,6 @@ public class AlternativeConstantLongVariableSetItemProvider extends AlternativeC
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 EcoreFactory.eINSTANCE.createEFactory()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
-				 EcoreFactory.eINSTANCE.createEObject()));
-
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java
index a8985a59..ee4ebf57 100644
--- a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java
+++ b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/AlternativeVariableSetItemProvider.java
@@ -552,6 +552,11 @@ public class AlternativeVariableSetItemProvider extends AlternativeVariableItemP
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 DNIFactory.eINSTANCE.createLinkPerformanceType()));
 
+		newChildDescriptors.add
+			(createChildParameter
+				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
+				 EcoreFactory.eINSTANCE.createEObject()));
+
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
@@ -587,11 +592,6 @@ public class AlternativeVariableSetItemProvider extends AlternativeVariableItemP
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
 				 EcoreFactory.eINSTANCE.createEFactory()));
 
-		newChildDescriptors.add
-			(createChildParameter
-				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
-				 EcoreFactory.eINSTANCE.createEObject()));
-
 		newChildDescriptors.add
 			(createChildParameter
 				(DNIAPPackage.Literals.ALTERNATIVE_PARAMETER_SET__ALTERNATIVE,
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/DNIAPItemProviderAdapterFactory.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/DNIAPItemProviderAdapterFactory.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/DNIAPItemProviderAdapterFactory.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/DNIAPItemProviderAdapterFactory.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/Dnimm3apEditPlugin.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/Dnimm3apEditPlugin.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/Dnimm3apEditPlugin.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/Dnimm3apEditPlugin.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/LinkAdaptationGroupItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/LinkAdaptationGroupItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/LinkAdaptationGroupItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/LinkAdaptationGroupItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/NodeAdaptationGroupItemProvider.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/NodeAdaptationGroupItemProvider.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/provider/NodeAdaptationGroupItemProvider.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/provider/NodeAdaptationGroupItemProvider.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/util/DNIAPAdapterFactory.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/util/DNIAPAdapterFactory.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/util/DNIAPAdapterFactory.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/util/DNIAPAdapterFactory.java
diff --git a/tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java b/tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java
similarity index 100%
rename from tools.descartes.dni.adaptation/src/main/java/tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java
rename to tools.descartes.dni.adaptation/src/tools/descartes/dni/dnimm3ap/util/DNIAPSwitch.java
diff --git a/tools.descartes.dni.core/model/DNIMM3.xcore b/tools.descartes.dni.core/model/DNIMM3.xcore
index 016f86a8..27b37988 100644
--- a/tools.descartes.dni.core/model/DNIMM3.xcore
+++ b/tools.descartes.dni.core/model/DNIMM3.xcore
@@ -2,8 +2,8 @@
 @Ecore(invocationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 	settingDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot",
 	validationDelegates="http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot")
-@GenModel(modelDirectory="/tools.descartes.dni.core/src/main/java",
-	editDirectory="/tools.descartes.dni.core/src/main/java", editorDirectory="/tools.descartes.dni.core/src/main/java",
+@GenModel(modelDirectory="/tools.descartes.dni.core/src",
+	editDirectory="/tools.descartes.dni.core/src", editorDirectory="/tools.descartes.dni.core/src",
 	fileExtensions="dni", prefix="DNI")
 package tools.descartes.dni.dnimm3
 
diff --git a/tools.descartes.dni.core/pom.xml b/tools.descartes.dni.core/pom.xml
index bac04103..7fd900ba 100644
--- a/tools.descartes.dni.core/pom.xml
+++ b/tools.descartes.dni.core/pom.xml
@@ -33,6 +33,8 @@
 	</repositories>
 
 	<build>
+		<sourceDirectory>src</sourceDirectory>
+		<testSourceDirectory>src-test</testSourceDirectory>
 		<plugins>
 			<plugin>
 				<artifactId>maven-compiler-plugin</artifactId>
diff --git a/tools.descartes.dni.core/src/test/resources/scenario0A.dni b/tools.descartes.dni.core/resources-test/scenario0A.dni
similarity index 100%
rename from tools.descartes.dni.core/src/test/resources/scenario0A.dni
rename to tools.descartes.dni.core/resources-test/scenario0A.dni
diff --git a/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
similarity index 92%
rename from tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java
rename to tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
index b5a689de..fbd0eaaa 100644
--- a/tools.descartes.dni.core/src/test/java/tools/descartes/dni/dnimm3/tools/ParserTest.java
+++ b/tools.descartes.dni.core/src-test/tools/descartes/dni/dnimm3/tools/ParserTest.java
@@ -17,7 +17,7 @@ public class ParserTest {
 
 	@Test
 	public void shouldConvertFileToModel() {
-		File file = new File("src/test/resources/scenario0A.dni");
+		File file = new File("resources-test/scenario0A.dni");
 		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(file);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
 	}
@@ -42,7 +42,7 @@ public class ParserTest {
 
 	@Test
 	public void shouldConvertByteArrayToModel() throws IOException {
-		Path path = Paths.get("src/test/resources/scenario0A.dni");
+		Path path = Paths.get("resources-test/scenario0A.dni");
 		byte[] data = Files.readAllBytes(path);
 		NetworkInfrastructureImpl networkInfrastructure = Parser.convertToModel(data);
 		Assert.assertEquals(6, networkInfrastructure.getStructure().getNodes().size());
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/AbstractAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AbstractAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/AbstractAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AbstractAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/AddressableEntity.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/AddressableEntity.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/AddressableEntity.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/BranchAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/BranchAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/BranchAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Common.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Common.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Common.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Common.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/CommunicatingApplication.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/CommunicatingApplication.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/CommunicatingApplication.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ConstantDoubleVariable.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ConstantDoubleVariable.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ConstantDoubleVariable.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ConstantDoubleVariable.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ConstantLongVariable.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ConstantLongVariable.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ConstantLongVariable.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ConstantLongVariable.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIFactory.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIFactory.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIFactory.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIFactory.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIPackage.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
similarity index 99%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIPackage.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
index b7106aac..227bc10d 100644
--- a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIPackage.java
+++ b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIPackage.java
@@ -22,7 +22,7 @@ import org.eclipse.emf.ecore.EReference;
  * <!-- end-user-doc -->
  * @see tools.descartes.dni.dnimm3.DNIFactory
  * @model kind="package"
- *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src/main/java' editDirectory='/tools.descartes.dni.core/src/main/java' editorDirectory='/tools.descartes.dni.core/src/main/java' fileExtensions='dni' prefix='DNI' basePackage='tools.descartes.dni'"
+ *        annotation="http://www.eclipse.org/emf/2002/GenModel modelDirectory='/tools.descartes.dni.core/src' editDirectory='/tools.descartes.dni.core/src' editorDirectory='/tools.descartes.dni.core/src' fileExtensions='dni' prefix='DNI' basePackage='tools.descartes.dni'"
  *        annotation="http://www.eclipse.org/emf/2011/Xcore Pivot='http://www.eclipse.org/emf/2002/Ecore/OCL/Pivot'"
  * @generated
  */
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIUnit.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIUnit.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DNIUnit.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DNIUnit.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DataUnit.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DataUnit.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DataUnit.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DataUnit.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Dependency.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Dependency.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Dependency.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Dependency.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Direction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Direction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Direction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Direction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DiscreteFunction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/DiscreteFunction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/DiscreteFunction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/End.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/End.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/End.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EndPerformance.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformance.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EndPerformance.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformance.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EndPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EndPerformanceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EndPerformanceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Entity.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Entity.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Entity.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Entity.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EntityAddress.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityAddress.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EntityAddress.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityAddress.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EntityTypes.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/EntityTypes.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/EntityTypes.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ExponentialFunction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ExponentialFunction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ExponentialFunction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ExponentialFunction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FloatCoordinate.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FloatCoordinate.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FloatCoordinate.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FloatCoordinate.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Flow.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Flow.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Flow.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FlowRoute.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FlowRoute.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FlowRoute.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FlowRoute.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FlowTraffic.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FlowTraffic.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/FlowTraffic.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/FlowTraffic.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Function.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Function.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Function.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Function.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/GenericFlowTraffic.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericFlowTraffic.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/GenericFlowTraffic.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericFlowTraffic.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/GenericWorkload.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/GenericWorkload.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/GenericWorkload.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Hop.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Hop.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Hop.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Hop.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ITypedEntity.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ITypedEntity.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ITypedEntity.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ITypedEntity.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Identifier.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Identifier.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Identifier.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Identifier.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Intermediate.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Intermediate.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Intermediate.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Intermediate.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IntermediatePerformance.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformance.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IntermediatePerformance.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformance.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/IntermediatePerformanceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Link.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Link.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Link.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LinkPerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LinkPerformanceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkPerformanceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LinkType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LinkType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LinkType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LoopAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LoopAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/LoopAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/LoopAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NamedElement.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NamedElement.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NamedElement.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NamedElement.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkConfiguration.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkConfiguration.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkConfiguration.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInfrastructure.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInfrastructure.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInfrastructure.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInfrastructure.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterface.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterface.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterface.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterface.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfacePerformanceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterfaceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkInterfaceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkProtocol.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkProtocol.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkProtocol.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkProtocol.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkStructure.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkStructure.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkStructure.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkTraffic.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NetworkTraffic.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NetworkTraffic.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Node.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Node.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Node.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NodeType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/NodeType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/NodeType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceLink.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceLink.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceLink.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceLink.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceNetworkInterface.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceSdnNode.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceSdnNode.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceSdnNode.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceSdnNode.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceSpecification.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceSpecification.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/PerformanceSpecification.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/PerformanceSpecification.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolLayer.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolLayer.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolLayer.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolLayer.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolStack.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolStack.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolStack.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolsRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/ProtocolsRepository.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/ProtocolsRepository.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/RandomVariable.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RandomVariable.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/RandomVariable.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RandomVariable.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Route.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Route.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Route.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Route.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/RoutesRepository.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/RoutesRepository.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/RoutesRepository.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SDN.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SDN.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SDN.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnControlFlow.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnControlFlow.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnControlFlow.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnControlFlow.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnController.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnController.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnController.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnControllerApplication.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnControllerApplication.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnControllerApplication.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnControllerApplication.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnFlowRule.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnFlowRule.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnFlowRule.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnFlowRule.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SdnNodePerformanceType.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SequenceAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SequenceAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SequenceAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Speed.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Speed.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Speed.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Speed.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SpeedUnit.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SpeedUnit.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/SpeedUnit.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/SpeedUnit.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/StartAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/StartAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/StartAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/StartAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/StopAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/StopAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/StopAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/StopAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Time.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Time.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Time.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Time.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TimeUnit.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TimeUnit.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TimeUnit.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TimeUnit.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TrafficSource.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TrafficSource.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TrafficSource.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TransmitAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TransmitAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/TransmitAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/TransmitAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/UnitPrefix.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/UnitPrefix.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/UnitPrefix.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/UnitPrefix.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Variable.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Variable.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Variable.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Variable.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/WaitAction.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/WaitAction.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/WaitAction.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/WaitAction.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Workload.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Workload.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/Workload.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/Workload.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/BranchActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/CommonImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommonImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/CommonImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommonImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/CommunicatingApplicationImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ConstantDoubleVariableImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ConstantDoubleVariableImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ConstantDoubleVariableImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ConstantDoubleVariableImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ConstantLongVariableImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ConstantLongVariableImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ConstantLongVariableImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ConstantLongVariableImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DNIFactoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIFactoryImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DNIFactoryImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIFactoryImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DNIPackageImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DataUnitImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DataUnitImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DataUnitImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DataUnitImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DirectionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DirectionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DirectionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DirectionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/DiscreteFunctionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndPerformanceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndPerformanceImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EndPerformanceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EntityAddressImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityAddressImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EntityAddressImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityAddressImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/EntityTypesImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ExponentialFunctionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ExponentialFunctionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ExponentialFunctionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ExponentialFunctionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FloatCoordinateImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FloatCoordinateImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FloatCoordinateImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FloatCoordinateImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowRouteImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowTrafficImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowTrafficImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/FlowTrafficImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/FlowTrafficImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/GenericFlowTrafficImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericFlowTrafficImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/GenericFlowTrafficImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericFlowTrafficImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/GenericWorkloadImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/HopImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/HopImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/HopImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/HopImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IdentifierImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IdentifierImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IdentifierImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IdentifierImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediateImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediateImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediateImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediateImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/IntermediatePerformanceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkPerformanceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LinkTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LoopActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LoopActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/LoopActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/LoopActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkConfigurationImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInfrastructureImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInfrastructureImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInfrastructureImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInfrastructureImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfacePerformanceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkInterfaceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkProtocolImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkProtocolImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkProtocolImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkProtocolImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkStructureImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NetworkTrafficImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NodeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NodeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/NodeTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceLinkImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceLinkImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceLinkImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceLinkImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceNetworkInterfaceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceNetworkInterfaceImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceNetworkInterfaceImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceNetworkInterfaceImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceSdnNodeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceSdnNodeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/PerformanceSdnNodeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/PerformanceSdnNodeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolLayerImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolLayerImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolLayerImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolLayerImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolStackImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/ProtocolsRepositoryImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RandomVariableImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RandomVariableImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RandomVariableImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RandomVariableImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RouteImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RouteImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RouteImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RouteImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/RoutesRepositoryImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SDNImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SDNImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SDNImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControlFlowImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControlFlowImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControlFlowImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControlFlowImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControllerApplicationImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerApplicationImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControllerApplicationImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerApplicationImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnControllerImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnFlowRuleImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SdnNodePerformanceTypeImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SequenceActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/SpeedUnitImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/StartActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/StartActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/StartActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/StartActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/StopActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/StopActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/StopActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/StopActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TimeUnitImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TrafficSourceImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TransmitActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TransmitActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/TransmitActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/TransmitActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/WaitActionImpl.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/WaitActionImpl.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/impl/WaitActionImpl.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/impl/WaitActionImpl.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIActionBarContributor.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIActionBarContributor.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIActionBarContributor.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIActionBarContributor.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIEditor.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIEditor.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIEditor.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIEditor.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIModelWizard.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIModelWizard.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/presentation/DNIModelWizard.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/presentation/DNIModelWizard.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/BranchActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/BranchActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/BranchActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/BranchActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/CommonItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/CommonItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/CommonItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/CommonItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/CommunicatingApplicationItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/CommunicatingApplicationItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/CommunicatingApplicationItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/CommunicatingApplicationItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ConstantDoubleVariableItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ConstantDoubleVariableItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ConstantDoubleVariableItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ConstantDoubleVariableItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ConstantLongVariableItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ConstantLongVariableItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ConstantLongVariableItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ConstantLongVariableItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DNIItemProviderAdapterFactory.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DNIItemProviderAdapterFactory.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DNIItemProviderAdapterFactory.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DNIItemProviderAdapterFactory.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DataUnitItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DataUnitItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DataUnitItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DataUnitItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DirectionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DirectionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DirectionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DirectionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DiscreteFunctionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DiscreteFunctionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/DiscreteFunctionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/DiscreteFunctionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/Dnimm3EditPlugin.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/Dnimm3EditPlugin.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/Dnimm3EditPlugin.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/Dnimm3EditPlugin.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndPerformanceItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndPerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndPerformanceItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndPerformanceItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndPerformanceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndPerformanceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EndPerformanceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EndPerformanceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EntityAddressItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EntityAddressItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EntityAddressItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EntityAddressItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EntityTypesItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EntityTypesItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/EntityTypesItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/EntityTypesItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ExponentialFunctionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ExponentialFunctionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ExponentialFunctionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ExponentialFunctionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FloatCoordinateItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FloatCoordinateItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FloatCoordinateItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FloatCoordinateItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowRouteItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowRouteItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowRouteItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowRouteItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowTrafficItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowTrafficItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/FlowTrafficItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/FlowTrafficItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/GenericFlowTrafficItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/GenericFlowTrafficItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/GenericFlowTrafficItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/GenericFlowTrafficItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/GenericWorkloadItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/GenericWorkloadItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/GenericWorkloadItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/GenericWorkloadItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/HopItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/HopItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/HopItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/HopItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IdentifierItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IdentifierItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IdentifierItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IdentifierItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediateItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediateItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediateItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediateItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/IntermediatePerformanceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkPerformanceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkPerformanceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkPerformanceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkPerformanceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LinkTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LinkTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LoopActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LoopActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/LoopActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/LoopActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkConfigurationItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkConfigurationItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkConfigurationItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkConfigurationItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInfrastructureItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInfrastructureItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInfrastructureItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInfrastructureItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfaceItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfaceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfaceItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfaceItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfacePerformanceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfacePerformanceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfacePerformanceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfacePerformanceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfaceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfaceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkInterfaceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkInterfaceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkProtocolItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkProtocolItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkProtocolItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkProtocolItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkStructureItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkStructureItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkStructureItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkStructureItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkTrafficItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkTrafficItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NetworkTrafficItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NetworkTrafficItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NodeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NodeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NodeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NodeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NodeTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NodeTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/NodeTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/NodeTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceLinkItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceLinkItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceLinkItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceLinkItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceNetworkInterfaceItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceNetworkInterfaceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceNetworkInterfaceItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceNetworkInterfaceItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceSdnNodeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceSdnNodeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/PerformanceSdnNodeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/PerformanceSdnNodeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolLayerItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolLayerItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolLayerItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolLayerItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolStackItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolStackItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolStackItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolStackItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolsRepositoryItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolsRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/ProtocolsRepositoryItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/ProtocolsRepositoryItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RandomVariableItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RandomVariableItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RandomVariableItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RandomVariableItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RouteItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RouteItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RouteItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RouteItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RoutesRepositoryItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RoutesRepositoryItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/RoutesRepositoryItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/RoutesRepositoryItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SDNItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SDNItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SDNItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SDNItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControlFlowItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControlFlowItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControlFlowItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControlFlowItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControllerApplicationItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControllerApplicationItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControllerApplicationItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControllerApplicationItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControllerItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControllerItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnControllerItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnControllerItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnFlowRuleItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnFlowRuleItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnFlowRuleItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnFlowRuleItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnNodePerformanceTypeItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnNodePerformanceTypeItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SdnNodePerformanceTypeItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SdnNodePerformanceTypeItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SequenceActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SequenceActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SequenceActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SequenceActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SpeedUnitItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SpeedUnitItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/SpeedUnitItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/SpeedUnitItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/StartActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/StartActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/StartActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/StartActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/StopActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/StopActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/StopActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/StopActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TimeUnitItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TimeUnitItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TimeUnitItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TimeUnitItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TrafficSourceItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TrafficSourceItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TrafficSourceItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TrafficSourceItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TransmitActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TransmitActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/TransmitActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/TransmitActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/WaitActionItemProvider.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/WaitActionItemProvider.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/provider/WaitActionItemProvider.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/provider/WaitActionItemProvider.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/tools/Parser.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/tools/Parser.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/util/DNIAdapterFactory.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/util/DNIAdapterFactory.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/util/DNIAdapterFactory.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/util/DNIAdapterFactory.java
diff --git a/tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/util/DNISwitch.java b/tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/util/DNISwitch.java
similarity index 100%
rename from tools.descartes.dni.core/src/main/java/tools/descartes/dni/dnimm3/util/DNISwitch.java
rename to tools.descartes.dni.core/src/tools/descartes/dni/dnimm3/util/DNISwitch.java
-- 
GitLab