From 466032a262994419bcd7aedbe0de5aa20b32b050 Mon Sep 17 00:00:00 2001
From: lempinen <lempinen@ac1ea38d-2e2b-0410-8846-a27921b304fc>
Date: Tue, 27 Mar 2012 09:05:33 +0000
Subject: [PATCH] Moved contents of elements2 to elements. (refs #3329)

git-svn-id: https://www.simantics.org/svn/simantics/sysdyn/trunk@24545 ac1ea38d-2e2b-0410-8846-a27921b304fc
---
 org.simantics.sysdyn.ui/adapters.xml                 |  2 +-
 .../simantics/sysdyn/ui/editor/DiagramViewer.java    | 12 ++++++------
 .../ui/editor/participant/PointerInteractor.java     | 10 +++++-----
 .../ui/editor/participant/SysdynConnectTool.java     |  6 +++---
 .../editor/participant/SysdynConnectionBuilder.java  |  6 +++---
 .../sysdyn/ui/editor/routing/DependencyRouter.java   |  2 +-
 .../sysdyn/ui/editor/routing/FlowRouter.java         |  2 +-
 .../ui/{elements2 => elements}/AuxiliaryFactory.java |  2 +-
 .../ui/{elements2 => elements}/BorderSceneGraph.java |  2 +-
 .../ui/{elements2 => elements}/CloudFactory.java     |  2 +-
 .../ComponentNameSynchronizer.java                   |  2 +-
 .../ConfigurationDiagramClassAdapter.java            |  2 +-
 .../ui/{elements2 => elements}/HoverShapeNode.java   |  2 +-
 .../HoverTextElementHandler.java                     |  2 +-
 .../HoverTextElementNoBounds.java                    |  2 +-
 .../ui/{elements2 => elements}/HoverTextNode.java    |  2 +-
 .../sysdyn/ui/{elements2 => elements}/Input.java     |  2 +-
 .../ui/{elements2 => elements}/InputFactory.java     |  2 +-
 .../ui/{elements2 => elements}/ModuleFactory.java    |  2 +-
 .../ui/{elements2 => elements}/ModuleNode.java       |  2 +-
 .../MultilineTextElement.java                        |  2 +-
 .../MultilineTextElementFactory.java                 |  2 +-
 .../{elements2 => elements}/MultilineTextNode.java   |  2 +-
 .../ui/{elements2 => elements}/Orientation.java      |  2 +-
 .../ui/{elements2 => elements}/RectangleNode.java    |  2 +-
 .../sysdyn/ui/{elements2 => elements}/Size.java      |  2 +-
 .../ui/{elements2 => elements}/StockFactory.java     |  2 +-
 .../SysdynElementClasses.java                        |  2 +-
 .../SysdynElementFactory.java                        |  2 +-
 .../{elements2 => elements}/SysdynElementHints.java  |  2 +-
 .../{elements2 => elements}/SysdynElementUtils.java  |  2 +-
 .../ui/{elements2 => elements}/ValveFactory.java     |  4 ++--
 .../{elements2 => elements}/ValveTextLocation.java   |  2 +-
 .../WholeElementTerminals.java                       |  2 +-
 .../ui/{elements2 => elements}/connections/Arcs.java |  2 +-
 .../connections/ConnectionClasses.java               |  2 +-
 .../connections/DependencyConnectionFactory.java     |  2 +-
 .../connections/DependencyEdgeClass.java             |  2 +-
 .../connections/DependencyEdgeFactory.java           |  2 +-
 .../connections/DependencyNode.java                  |  2 +-
 .../connections/FlowArrowLineStyle.java              |  2 +-
 .../connections/FlowConnectionStyle.java             |  2 +-
 .../{elements2 => elements}/connections/Flows.java   |  2 +-
 .../connections/RouteFlowConnectionFactory.java      |  4 ++--
 .../connections/RouteFlowEdgeClass.java              |  2 +-
 .../connections/RouteFlowEdgeFactory.java            |  2 +-
 .../connections/SysdynConnectionClass.java           |  2 +-
 .../profiles/IssueDecorationStyle.java               |  2 +-
 .../profiles/SimulationPlaybackStyle.java            |  2 +-
 .../sysdyn/ui/properties/DependencyTab.java          |  2 +-
 50 files changed, 65 insertions(+), 65 deletions(-)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/AuxiliaryFactory.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/BorderSceneGraph.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/CloudFactory.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ComponentNameSynchronizer.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ConfigurationDiagramClassAdapter.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/HoverShapeNode.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/HoverTextElementHandler.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/HoverTextElementNoBounds.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/HoverTextNode.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/Input.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/InputFactory.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ModuleFactory.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ModuleNode.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/MultilineTextElement.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/MultilineTextElementFactory.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/MultilineTextNode.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/Orientation.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/RectangleNode.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/Size.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/StockFactory.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/SysdynElementClasses.java (75%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/SysdynElementFactory.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/SysdynElementHints.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/SysdynElementUtils.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ValveFactory.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/ValveTextLocation.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/WholeElementTerminals.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/Arcs.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/ConnectionClasses.java (92%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/DependencyConnectionFactory.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/DependencyEdgeClass.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/DependencyEdgeFactory.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/DependencyNode.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/FlowArrowLineStyle.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/FlowConnectionStyle.java (93%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/Flows.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/RouteFlowConnectionFactory.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/RouteFlowEdgeClass.java (95%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/RouteFlowEdgeFactory.java (94%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/connections/SysdynConnectionClass.java (97%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/profiles/IssueDecorationStyle.java (96%)
 rename org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/{elements2 => elements}/profiles/SimulationPlaybackStyle.java (97%)

diff --git a/org.simantics.sysdyn.ui/adapters.xml b/org.simantics.sysdyn.ui/adapters.xml
index 5ddb9220..89d50f37 100644
--- a/org.simantics.sysdyn.ui/adapters.xml
+++ b/org.simantics.sysdyn.ui/adapters.xml
@@ -10,5 +10,5 @@
         VTT Technical Research Centre of Finland - initial API and implementation
  -->
 
-<adapters>

	<target interface="org.simantics.db.layer0.adapter.Realization">
		<type uri="http://www.simantics.org/Sysdyn-0.0/Module"
			class="org.simantics.structural2.realization.StructuralRealization">
			<this />
		</type>
	</target>

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-0.0/DiagramToCompositeMapping"
	      class = "org.simantics.sysdyn.ui.editor.DiagramToCompositeMapping3">
	    <graph/>
		<this />
	</type>
	</target>
	
	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.structural.ui.modelBrowser.nodes.ModelNode">
			<this />
		</type>
	</target>		
		

	<target
		interface="org.simantics.browsing.ui.common.node.AbstractNode">
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

		<resource
			uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.browser.nodes.SymbolNode">
			<this />
		</resource>

		<type
			uri="http://www.simantics.org/Simulation-1.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/Result"
			class="org.simantics.sysdyn.ui.browser.nodes.SimulationResultNode">
			<this />
		</type>
		
	</target>

	<!-- Inject default connection routing algorithm for sysdyn diagrams -->
	<target interface="org.simantics.g2d.diagram.DiagramClass">
		<adapter uri="http://www.simantics.org/Sysdyn-0.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements2.ConfigurationDiagramClassAdapter" />
	</target>

	<!-- Sysdyn symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements2.StockFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements2.ModuleFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements2.ValveFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements2.AuxiliaryFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements2.CloudFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements2.InputFactory" />

		<type uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements2.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements2.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements2.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements2.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements2.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements2.InputFactory" />			
	</target>
	
	<!-- Additional symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements2.MultilineTextElementFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements2.MultilineTextElementFactory" />         
    </target>                  
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements2.connections.RouteFlowEdgeFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements2.connections.RouteFlowEdgeFactory" />            
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements2.connections.RouteFlowConnectionFactory">
            <graph/>
        </type>                  	
			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements2.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-0.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasArrowConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>fill 1</string>
	  </resource>
	</target>
	
	<!-- ModelBrowser2 -->
	
	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleTypeChildRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleContentChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleContentChildRule"/>              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.VariableChildRule"/>                  
              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/AxisChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisChildRule"/>     
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.VariableChildRule"/>  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesChildRule"/>           
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesChildRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableChildRule"/>     
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterChildRule"/>               
    </target>
    
    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.ModuleTypeLabelRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableNameLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.VariableNameLabelRule"/>

        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.VariableImageRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ChartImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ChartImageRule"/>      
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ResultImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ResultImageRule"/>                        
            
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/AxisLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisLabelRule"/> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableLabelRule"/>                
                
                     
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>     
            
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelRule"/>    
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterLabelDecorationRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelDecorationRule"/>               
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterModifierRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterModifierRule"/>    
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterSorterRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterSorterRule"/>                                      
    </target>    
    
    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewModuleType"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewModuleTypeAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewEnumeration"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewEnumerationAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunction"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionLibraryAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSharedFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSharedFunctionLibraryAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewExperimentAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSimulationPlaybackExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSimulationPlaybackExperimentAction" />    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewLineChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewLineChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewBarChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewBarChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewPieChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewPieChartAction" />        
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSheet"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSheetAction" />       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewHistoryData"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewHistoryDataAction" />                                                                                              
    </target>         
    
   <target interface="org.simantics.db.layer0.adapter.DropActionFactory">
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/FunctionDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.FunctionDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/ChartDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.ChartDropAction" />            
   
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesActionContext/Actions/AxisDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisDropAction" />            
            
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />                        
    </target>     
  
    <target interface="org.simantics.db.layer0.adapter.Remover">
        <type uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbol"
            class="org.simantics.sysdyn.ui.browser.actions.remove.ModuleTypeRemover">
            <graph />
            <this />
        </type>
    </target>
    
    
    <target interface="org.simantics.browsing.ui.model.nodetypes.NodeType">
        <baseType uri="http://www.simantics.org/Layer0-1.0/Entity" />
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbolNodeType"
            class="org.simantics.sysdyn.ui.browser.nodeTypes.ModuleSymbolNodeType"
            constructor="create">
            <this/>
        </type>        
     </target>
    
  <!-- PROFILES -->
    <target interface="org.simantics.scenegraph.profile.Style">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/SimulationPlaybackStyle"
            class="org.simantics.sysdyn.ui.elements2.profiles.SimulationPlaybackStyle">
        </resource>
                <resource uri="http://www.simantics.org/Sysdyn-0.0/IssueStyle"
            class="org.simantics.sysdyn.ui.elements2.profiles.IssueDecorationStyle">
        </resource>
    </target>
    
  <!-- Charts -->
    <target interface="org.simantics.diagram.adapter.ElementFactory">
        <resource uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementFactory" />
            
        <type uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementFactory" />
    </target>
                
    <target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
        <resource uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementWriter" />
    </target>
                    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IJFreeChart">
        <type uri="http://www.simantics.org/JFreeChart-1.0/Chart"
            class="org.simantics.sysdyn.ui.trend.chart.JFreeChart">
            <graph />
            <this />
        </type>
    </target>  
    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IDataset">
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYDataset"
            class="org.simantics.sysdyn.ui.trend.chart.XYDataset">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryDataset"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryDataset">
            <graph />
            <this />
        </type>        
        <type uri="http://www.simantics.org/JFreeChart-1.0/PieDataset"
            class="org.simantics.sysdyn.ui.trend.chart.PieDataset">
            <graph />
            <this />
        </type>          
    </target>
    
     <target interface="org.simantics.sysdyn.ui.trend.chart.ITitle">
        <type uri="http://www.simantics.org/JFreeChart-1.0/TextTitle"
            class="org.simantics.sysdyn.ui.trend.chart.TextTitle">
            <graph />
            <this />
        </type>
    </target>
    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IAxis">
        <type uri="http://www.simantics.org/JFreeChart-1.0/NumberAxis"
            class="org.simantics.sysdyn.ui.trend.chart.NumberAxis">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryAxis"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryAxis">
            <graph />
            <this />
        </type>        
    </target>
       
    <target interface="org.simantics.sysdyn.ui.trend.chart.IPlot">
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYPlot"
            class="org.simantics.sysdyn.ui.trend.chart.XYPlot">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryPlot"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryPlot">
            <graph />
            <this />
        </type>      
        <type uri="http://www.simantics.org/JFreeChart-1.0/PiePlot"
            class="org.simantics.sysdyn.ui.trend.chart.PiePlot">
            <graph />
            <this />
        </type>               
    </target>
    
     <target interface="org.simantics.sysdyn.ui.trend.chart.IRenderer">
     
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYLineRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.XYLineRenderer">
            <graph />
            <this />
        </type>  
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYAreaRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.XYAreaRenderer">
            <graph />
            <this />
        </type>        
                
        <type uri="http://www.simantics.org/JFreeChart-1.0/BarRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.BarRenderer">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/StackedBarRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.StackedBarRenderer">
            <graph />
            <this />
        </type>        
    </target>    
       
+<adapters>

	<target interface="org.simantics.db.layer0.adapter.Realization">
		<type uri="http://www.simantics.org/Sysdyn-0.0/Module"
			class="org.simantics.structural2.realization.StructuralRealization">
			<this />
		</type>
	</target>

	<target interface="org.simantics.layer0.utils.triggers.ITrigger">
	<type uri = "http://www.simantics.org/Sysdyn-0.0/DiagramToCompositeMapping"
	      class = "org.simantics.sysdyn.ui.editor.DiagramToCompositeMapping3">
	    <graph/>
		<this />
	</type>
	</target>
	
	<target interface="org.simantics.structural.ui.modelBrowser.nodes.AbstractNode">
		<type uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.structural.ui.modelBrowser.nodes.ModelNode">
			<this />
		</type>
	</target>		
		

	<target
		interface="org.simantics.browsing.ui.common.node.AbstractNode">
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/SysdynModel"
			class="org.simantics.sysdyn.ui.browser.nodes.ModelNode">
			<this />
		</type>

		<resource
			uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.browser.nodes.SymbolNode">
			<this />
		</resource>

		<type
			uri="http://www.simantics.org/Simulation-1.0/Experiment"
			class="org.simantics.sysdyn.ui.browser.nodes.ExperimentNode">
			<this />
		</type>
		
		<type
			uri="http://www.simantics.org/Sysdyn-0.0/Result"
			class="org.simantics.sysdyn.ui.browser.nodes.SimulationResultNode">
			<this />
		</type>
		
	</target>

	<!-- Inject default connection routing algorithm for sysdyn diagrams -->
	<target interface="org.simantics.g2d.diagram.DiagramClass">
		<adapter uri="http://www.simantics.org/Sysdyn-0.0/ConfigurationDiagram"
			adapterClass="org.simantics.sysdyn.ui.elements.ConfigurationDiagramClassAdapter" />
	</target>

	<!-- Sysdyn symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<resource uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<resource uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />

		<type uri="http://www.simantics.org/Sysdyn-0.0/StockSymbol"
			class="org.simantics.sysdyn.ui.elements.StockFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ModuleSymbol"
			class="org.simantics.sysdyn.ui.elements.ModuleFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/ValveSymbol"
			class="org.simantics.sysdyn.ui.elements.ValveFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/AuxiliarySymbol"
			class="org.simantics.sysdyn.ui.elements.AuxiliaryFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/CloudSymbol"
			class="org.simantics.sysdyn.ui.elements.CloudFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/InputSymbol"
			class="org.simantics.sysdyn.ui.elements.InputFactory" />			
	</target>
	
	<!-- Additional symbols -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
	    <resource uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/AdditionalSymbols/MultilineText"
            class="org.simantics.sysdyn.ui.elements.MultilineTextElementFactory" />         
    </target>                  
	
	<!-- Sysdyn connections -->
	<target interface="org.simantics.diagram.adapter.ElementFactory">
		<!-- Edges -->       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeFactory" />            
        <type uri="http://www.simantics.org/Sysdyn-0.0/FlowConnection"
            class="org.simantics.sysdyn.ui.elements.connections.RouteFlowConnectionFactory">
            <graph/>
        </type>                  	
			
		<resource uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyEdgeFactory" />
		<type uri="http://www.simantics.org/Sysdyn-0.0/DependencyConnection"
			class="org.simantics.sysdyn.ui.elements.connections.DependencyConnectionFactory" />
	</target>
	
	<target interface="org.simantics.g2d.connection.EdgeVisualsConfigurer">
	  <baseType uri="http://www.simantics.org/Diagram-0.0/HasConnector" />
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasPlainConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>none 0</string>
	  </resource>
	  <resource uri="http://www.simantics.org/Diagram-0.0/HasArrowConnector"
	   class="org.simantics.diagram.content.ArrowConfigurer">
	   <string>fill 1</string>
	  </resource>
	</target>
	
	<!-- ModelBrowser2 -->
	
	<target interface="org.simantics.browsing.ui.model.children.ChildRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleTypeChildRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleContentChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.ModuleContentChildRule"/>              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.browser.childrules.VariableChildRule"/>                  
              
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/AxisChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisChildRule"/>     
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.VariableChildRule"/>  
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesChildRule"/>           
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesChildRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesChildRule"/>    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableChildRule"/>     
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterChildRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterChildRule"/>               
    </target>
    
    <target interface="org.simantics.browsing.ui.model.visuals.VisualsRule">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleTypeLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.ModuleTypeLabelRule"/>
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableNameLabelRule"
            class="org.simantics.sysdyn.ui.browser.labelrules.VariableNameLabelRule"/>

        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/VariableImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.VariableImageRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ChartImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ChartImageRule"/>      
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ResultImageRule"
            class="org.simantics.sysdyn.ui.browser.imagerules.ResultImageRule"/>                        
            
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/AxisLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisLabelRule"/> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesLabelRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/HistoryDataset/HistoryDatasetVariablesBrowseContext/VariableLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.historyDataset.VariableLabelRule"/>                
                
                     
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>         
        <resource uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesBrowseContext/SeriesLabelDecorationRule"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesLabelDecorationRule"/>     
            
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterLabelRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelRule"/>    
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterLabelDecorationRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterLabelDecorationRule"/>               
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterModifierRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterModifierRule"/>    
        <resource uri=" http://www.simantics.org/Sysdyn-1.1/Module/ParameterOverrideBrowseContext/ParameterSorterRule"
            class="org.simantics.sysdyn.ui.properties.widgets.modules.ParameterSorterRule"/>                                      
    </target>    
    
    <target interface="org.simantics.db.layer0.adapter.ActionFactory">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewModuleType"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewModuleTypeAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewEnumeration"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewEnumerationAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunction"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewFunctionLibraryAction" />
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSharedFunctionLibrary"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSharedFunctionLibraryAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewExperimentAction" />   
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSimulationPlaybackExperiment"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSimulationPlaybackExperimentAction" />    
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewLineChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewLineChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewBarChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewBarChartAction" /> 
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewPieChart"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewPieChartAction" />        
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewSheet"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewSheetAction" />       
        <resource uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/NewHistoryData"
            class="org.simantics.sysdyn.ui.browser.actions.newActions.NewHistoryDataAction" />                                                                                              
    </target>         
    
   <target interface="org.simantics.db.layer0.adapter.DropActionFactory">
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/FunctionDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.FunctionDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingActionContext/Actions/ChartDropAction"
            class="org.simantics.sysdyn.ui.browser.actions.drop.ChartDropAction" />            
   
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/ChartAxisAndVariablesActionContext/Actions/AxisDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.AxisDropAction" />            
            
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/BarSeriesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />
        <resource
            uri="http://www.simantics.org/Sysdyn-0.0/PieSeriesActionContext/Actions/SeriesDropAction"
            class="org.simantics.sysdyn.ui.trend.chart.graphexplorer.SeriesDropAction" />                        
    </target>     
  
    <target interface="org.simantics.db.layer0.adapter.Remover">
        <type uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbol"
            class="org.simantics.sysdyn.ui.browser.actions.remove.ModuleTypeRemover">
            <graph />
            <this />
        </type>
    </target>
    
    
    <target interface="org.simantics.browsing.ui.model.nodetypes.NodeType">
        <baseType uri="http://www.simantics.org/Layer0-1.0/Entity" />
        <type
            uri="http://www.simantics.org/Sysdyn-0.0/ModelingBrowseContext/ModuleSymbolNodeType"
            class="org.simantics.sysdyn.ui.browser.nodeTypes.ModuleSymbolNodeType"
            constructor="create">
            <this/>
        </type>        
     </target>
    
  <!-- PROFILES -->
    <target interface="org.simantics.scenegraph.profile.Style">
        <resource uri="http://www.simantics.org/Sysdyn-0.0/SimulationPlaybackStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.SimulationPlaybackStyle">
        </resource>
                <resource uri="http://www.simantics.org/Sysdyn-0.0/IssueStyle"
            class="org.simantics.sysdyn.ui.elements.profiles.IssueDecorationStyle">
        </resource>
    </target>
    
  <!-- Charts -->
    <target interface="org.simantics.diagram.adapter.ElementFactory">
        <resource uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementFactory" />
            
        <type uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementFactory" />
    </target>
                
    <target interface="org.simantics.diagram.synchronization.graph.ElementWriter">
        <resource uri="http://www.simantics.org/JFreeChart-1.0/ChartElement"
            class="org.simantics.sysdyn.ui.trend.chart.element.ChartElementWriter" />
    </target>
                    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IJFreeChart">
        <type uri="http://www.simantics.org/JFreeChart-1.0/Chart"
            class="org.simantics.sysdyn.ui.trend.chart.JFreeChart">
            <graph />
            <this />
        </type>
    </target>  
    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IDataset">
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYDataset"
            class="org.simantics.sysdyn.ui.trend.chart.XYDataset">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryDataset"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryDataset">
            <graph />
            <this />
        </type>        
        <type uri="http://www.simantics.org/JFreeChart-1.0/PieDataset"
            class="org.simantics.sysdyn.ui.trend.chart.PieDataset">
            <graph />
            <this />
        </type>          
    </target>
    
     <target interface="org.simantics.sysdyn.ui.trend.chart.ITitle">
        <type uri="http://www.simantics.org/JFreeChart-1.0/TextTitle"
            class="org.simantics.sysdyn.ui.trend.chart.TextTitle">
            <graph />
            <this />
        </type>
    </target>
    
    <target interface="org.simantics.sysdyn.ui.trend.chart.IAxis">
        <type uri="http://www.simantics.org/JFreeChart-1.0/NumberAxis"
            class="org.simantics.sysdyn.ui.trend.chart.NumberAxis">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryAxis"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryAxis">
            <graph />
            <this />
        </type>        
    </target>
       
    <target interface="org.simantics.sysdyn.ui.trend.chart.IPlot">
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYPlot"
            class="org.simantics.sysdyn.ui.trend.chart.XYPlot">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/CategoryPlot"
            class="org.simantics.sysdyn.ui.trend.chart.CategoryPlot">
            <graph />
            <this />
        </type>      
        <type uri="http://www.simantics.org/JFreeChart-1.0/PiePlot"
            class="org.simantics.sysdyn.ui.trend.chart.PiePlot">
            <graph />
            <this />
        </type>               
    </target>
    
     <target interface="org.simantics.sysdyn.ui.trend.chart.IRenderer">
     
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYLineRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.XYLineRenderer">
            <graph />
            <this />
        </type>  
        <type uri="http://www.simantics.org/JFreeChart-1.0/XYAreaRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.XYAreaRenderer">
            <graph />
            <this />
        </type>        
                
        <type uri="http://www.simantics.org/JFreeChart-1.0/BarRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.BarRenderer">
            <graph />
            <this />
        </type>
        <type uri="http://www.simantics.org/JFreeChart-1.0/StackedBarRenderer"
            class="org.simantics.sysdyn.ui.trend.chart.StackedBarRenderer">
            <graph />
            <this />
        </type>        
    </target>    
       
 </adapters>
\ No newline at end of file
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
index 34dd82e5..f41e0574 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/DiagramViewer.java
@@ -55,12 +55,12 @@ import org.simantics.sysdyn.ui.editor.participant.CreateVariablesShortcutPartici
 import org.simantics.sysdyn.ui.editor.participant.SysdynComponentCopyAdvisor;
 import org.simantics.sysdyn.ui.editor.participant.SysdynElementClassProviders;
 import org.simantics.sysdyn.ui.editor.participant.SysdynPopulateElementDropParticipant;
-import org.simantics.sysdyn.ui.elements2.CloudFactory;
-import org.simantics.sysdyn.ui.elements2.SysdynElementClasses;
-import org.simantics.sysdyn.ui.elements2.SysdynElementFactory;
-import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;
-import org.simantics.sysdyn.ui.elements2.connections.RouteFlowEdgeClass;
-import org.simantics.sysdyn.ui.elements2.connections.SysdynConnectionClass;
+import org.simantics.sysdyn.ui.elements.CloudFactory;
+import org.simantics.sysdyn.ui.elements.SysdynElementClasses;
+import org.simantics.sysdyn.ui.elements.SysdynElementFactory;
+import org.simantics.sysdyn.ui.elements.connections.ConnectionClasses;
+import org.simantics.sysdyn.ui.elements.connections.RouteFlowEdgeClass;
+import org.simantics.sysdyn.ui.elements.connections.SysdynConnectionClass;
 import org.simantics.sysdyn.ui.properties.SysdynPropertyPage;
 import org.simantics.sysdyn.ui.trend.chart.element.PopulateChartDropParticipant;
 import org.simantics.ui.workbench.IPropertyPage;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/PointerInteractor.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/PointerInteractor.java
index 3cc4e29f..16b08a62 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/PointerInteractor.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/PointerInteractor.java
@@ -41,11 +41,11 @@ import org.simantics.scenegraph.g2d.events.MouseEvent.MouseButtonPressedEvent;
 import org.simantics.sysdyn.ui.editor.participant.SysdynElementClassProviders.ISysdynElementClassProvider;
 import org.simantics.sysdyn.ui.editor.routing.DependencyRouter;
 import org.simantics.sysdyn.ui.editor.routing.FlowRouter;
-import org.simantics.sysdyn.ui.elements2.AuxiliaryFactory;
-import org.simantics.sysdyn.ui.elements2.CloudFactory;
-import org.simantics.sysdyn.ui.elements2.InputFactory;
-import org.simantics.sysdyn.ui.elements2.ModuleFactory;
-import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;
+import org.simantics.sysdyn.ui.elements.AuxiliaryFactory;
+import org.simantics.sysdyn.ui.elements.CloudFactory;
+import org.simantics.sysdyn.ui.elements.InputFactory;
+import org.simantics.sysdyn.ui.elements.ModuleFactory;
+import org.simantics.sysdyn.ui.elements.connections.ConnectionClasses;
 
 /**
  * Pointer tool does the following operations with mouse:
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
index 036d5bb6..6d28cd96 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectTool.java
@@ -50,9 +50,9 @@ import org.simantics.scenegraph.g2d.snap.ISnapAdvisor;
 import org.simantics.structural2.modelingRules.ConnectionJudgement;
 import org.simantics.sysdyn.SysdynResource;
 import org.simantics.sysdyn.ui.editor.routing.FlowRouter;
-import org.simantics.sysdyn.ui.elements2.CloudFactory;
-import org.simantics.sysdyn.ui.elements2.ValveFactory.ValveSceneGraph;
-import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;
+import org.simantics.sysdyn.ui.elements.CloudFactory;
+import org.simantics.sysdyn.ui.elements.ValveFactory.ValveSceneGraph;
+import org.simantics.sysdyn.ui.elements.connections.ConnectionClasses;
 import org.simantics.ui.SimanticsUI;
 import org.simantics.utils.datastructures.Callback;
 import org.simantics.utils.ui.ExceptionUtils;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
index da8581db..1b409587 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/participant/SysdynConnectionBuilder.java
@@ -43,9 +43,9 @@ import org.simantics.g2d.elementclass.FlagClass;
 import org.simantics.layer0.Layer0;
 import org.simantics.structural2.modelingRules.ConnectionJudgement;
 import org.simantics.structural2.modelingRules.IModelingRules;
-import org.simantics.sysdyn.ui.elements2.SysdynElementClasses;
-import org.simantics.sysdyn.ui.elements2.ValveFactory;
-import org.simantics.sysdyn.ui.elements2.connections.ConnectionClasses;
+import org.simantics.sysdyn.ui.elements.SysdynElementClasses;
+import org.simantics.sysdyn.ui.elements.ValveFactory;
+import org.simantics.sysdyn.ui.elements.connections.ConnectionClasses;
 import org.simantics.utils.datastructures.Pair;
 
 public class SysdynConnectionBuilder extends ConnectionBuilder{
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
index bbd982da..1b2bf60d 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/DependencyRouter.java
@@ -8,7 +8,7 @@ import java.awt.geom.Rectangle2D;
 import org.simantics.g2d.routing.IConnection;
 import org.simantics.g2d.routing.IConnection.Connector;
 import org.simantics.g2d.routing.IRouter2;
-import org.simantics.sysdyn.ui.elements2.connections.Arcs;
+import org.simantics.sysdyn.ui.elements.connections.Arcs;
 import org.simantics.utils.datastructures.Pair;
 
 public class DependencyRouter implements IRouter2 {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/FlowRouter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/FlowRouter.java
index 7d33be3d..2e813118 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/FlowRouter.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/editor/routing/FlowRouter.java
@@ -10,7 +10,7 @@ import org.simantics.g2d.routing.Constants;
 import org.simantics.g2d.routing.IConnection;
 import org.simantics.g2d.routing.IConnection.Connector;
 import org.simantics.g2d.routing.IRouter2;
-import org.simantics.sysdyn.ui.elements2.connections.Flows;
+import org.simantics.sysdyn.ui.elements.connections.Flows;
 
 public class FlowRouter implements IRouter2{
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/AuxiliaryFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/AuxiliaryFactory.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/AuxiliaryFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/AuxiliaryFactory.java
index 73c4f62d..48463e08 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/AuxiliaryFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/AuxiliaryFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.geom.Ellipse2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/BorderSceneGraph.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/BorderSceneGraph.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/BorderSceneGraph.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/BorderSceneGraph.java
index 948d830d..2126e9c3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/BorderSceneGraph.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/BorderSceneGraph.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.geom.AffineTransform;
 import org.simantics.g2d.element.ElementUtils;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/CloudFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/CloudFactory.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/CloudFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/CloudFactory.java
index f0b9dbcc..2e5a5571 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/CloudFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/CloudFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ComponentNameSynchronizer.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ComponentNameSynchronizer.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ComponentNameSynchronizer.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ComponentNameSynchronizer.java
index 7e08e26d..0e47ca9b 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ComponentNameSynchronizer.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ComponentNameSynchronizer.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.databoard.Bindings;
 import org.simantics.db.Resource;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ConfigurationDiagramClassAdapter.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ConfigurationDiagramClassAdapter.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ConfigurationDiagramClassAdapter.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ConfigurationDiagramClassAdapter.java
index b102a163..e562ff35 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ConfigurationDiagramClassAdapter.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ConfigurationDiagramClassAdapter.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.Resource;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverShapeNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverShapeNode.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverShapeNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverShapeNode.java
index f93a15de..e7e6e810 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverShapeNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverShapeNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementHandler.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementHandler.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementHandler.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementHandler.java
index 9063b203..5621765a 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementHandler.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementHandler.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.Font;
 import java.awt.font.FontRenderContext;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementNoBounds.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementNoBounds.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
index 7e2f3545..a3295d47 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextElementNoBounds.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextElementNoBounds.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextNode.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextNode.java
index b01d5136..a0c3941c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/HoverTextNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/HoverTextNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Input.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Input.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Input.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Input.java
index d8e37fb3..54f83d4c 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Input.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Input.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.handler.ElementHandler;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/InputFactory.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/InputFactory.java
index 58021f22..da63cc38 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/InputFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/InputFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleFactory.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleFactory.java
index 678f63e8..b480b943 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Font;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleNode.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleNode.java
index a4eee590..1c1825fc 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ModuleNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ModuleNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElement.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElement.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElement.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElement.java
index 70953658..fe2e31a2 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElement.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElement.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.Color;
 import java.awt.Font;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElementFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElementFactory.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElementFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElementFactory.java
index 5597c4b1..b63810ec 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextElementFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextElementFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextNode.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextNode.java
index 09e1d3ba..c756baa4 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/MultilineTextNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/MultilineTextNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.AlphaComposite;
 import java.awt.BasicStroke;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Orientation.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Orientation.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Orientation.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Orientation.java
index 77733071..dbf32579 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Orientation.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Orientation.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.handler.ElementHandler;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/RectangleNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/RectangleNode.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/RectangleNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/RectangleNode.java
index 8aa983d6..1f05f54b 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/RectangleNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/RectangleNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Size.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Size.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Size.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Size.java
index 8bfd15d8..00b0d2f3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/Size.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/Size.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.geom.Rectangle2D;
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/StockFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/StockFactory.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/StockFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/StockFactory.java
index c7e277a7..fcba20c1 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/StockFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/StockFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.geom.Rectangle2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementClasses.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementClasses.java
similarity index 75%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementClasses.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementClasses.java
index 6dc0364f..a2cb04a7 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementClasses.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementClasses.java
@@ -1,4 +1,4 @@
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 public class SysdynElementClasses {
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementFactory.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementFactory.java
index 65e6e064..f71225be 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.Font;
 import java.awt.geom.AffineTransform;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementHints.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementHints.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementHints.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementHints.java
index 8873c23f..1b921020 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementHints.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementHints.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementUtils.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementUtils.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementUtils.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementUtils.java
index 1a80e682..6802a9d9 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/SysdynElementUtils.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/SysdynElementUtils.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.g2d.element.IElement;
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveFactory.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveFactory.java
index 50642b2e..00c89fd3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -65,7 +65,7 @@ public class ValveFactory extends SysdynElementFactory {
     public static final Image          VALVE_STATIC_IMAGE = new ShapeImage(createShape(VALVE_SIZE, false), null, STROKE, true);
 
     /* (non-Javadoc)
-     * @see org.simantics.sysdyn.ui.elements2.SysdynElementFactory#compileElementClass(org.simantics.db.Resource, java.util.Collection)
+     * @see org.simantics.sysdyn.ui.elements.SysdynElementFactory#compileElementClass(org.simantics.db.Resource, java.util.Collection)
      */
     @Override
     protected ElementClass compileElementClass(Resource elementType, Collection<ObjectTerminal> terminals) {
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveTextLocation.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveTextLocation.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveTextLocation.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveTextLocation.java
index 8361eec8..8957e437 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/ValveTextLocation.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/ValveTextLocation.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import org.simantics.g2d.element.IElement;
 import org.simantics.g2d.element.handler.ElementHandler;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/WholeElementTerminals.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/WholeElementTerminals.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/WholeElementTerminals.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/WholeElementTerminals.java
index ed736449..ff409fe1 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/WholeElementTerminals.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/WholeElementTerminals.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2;
+package org.simantics.sysdyn.ui.elements;
 
 import java.awt.Shape;
 import java.util.Collection;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Arcs.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Arcs.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
index 4994125f..51d4240f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Arcs.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Arcs.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.geom.Rectangle2D;
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/ConnectionClasses.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/ConnectionClasses.java
similarity index 92%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/ConnectionClasses.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/ConnectionClasses.java
index 503bfa2f..310c59f4 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/ConnectionClasses.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/ConnectionClasses.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 public class ConnectionClasses {
 
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyConnectionFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyConnectionFactory.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyConnectionFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyConnectionFactory.java
index 10af9e77..fcfb5445 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyConnectionFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyConnectionFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.util.HashMap;
 import java.util.concurrent.ConcurrentSkipListMap;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeClass.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeClass.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
index a87f6423..64d98631 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeClass.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeClass.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeFactory.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeFactory.java
index 1e8aabb7..e8f1b89f 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyEdgeFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyEdgeFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.Resource;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyNode.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyNode.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
index 95513a8f..3c00d95d 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/DependencyNode.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/DependencyNode.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowArrowLineStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowArrowLineStyle.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowArrowLineStyle.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowArrowLineStyle.java
index ca2f0921..885b75b5 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowArrowLineStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowArrowLineStyle.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowConnectionStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
similarity index 93%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowConnectionStyle.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
index 90da81ed..a57511e3 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/FlowConnectionStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/FlowConnectionStyle.java
@@ -1,4 +1,4 @@
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.Color;
 import java.awt.Graphics2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Flows.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Flows.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Flows.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Flows.java
index 051b3b18..a7c6bd9e 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/Flows.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/Flows.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.geom.Path2D;
 import java.awt.geom.PathIterator;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowConnectionFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowConnectionFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
index 682b2cf9..df190df7 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowConnectionFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowConnectionFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.BasicStroke;
 import java.awt.Color;
@@ -79,7 +79,7 @@ import org.simantics.structural2.modelingRules.CPTerminal;
 import org.simantics.structural2.modelingRules.IAttachmentRelationMap;
 import org.simantics.structural2.modelingRules.IModelingRules;
 import org.simantics.sysdyn.SysdynResource;
-import org.simantics.sysdyn.ui.elements2.ValveFactory.ValveSceneGraph;
+import org.simantics.sysdyn.ui.elements.ValveFactory.ValveSceneGraph;
 /**
  * An element class for Sysdyn Flow elements.
  * Copied from RouteGraphConnectionClassFactory and adapted to Flow needs
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeClass.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
similarity index 95%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeClass.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
index 638e3177..f238ec37 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeClass.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeClass.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.util.ArrayList;
 import java.util.List;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeFactory.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeFactory.java
similarity index 94%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeFactory.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeFactory.java
index 838c2d06..97bb8452 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/RouteFlowEdgeFactory.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/RouteFlowEdgeFactory.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import org.simantics.db.AsyncReadGraph;
 import org.simantics.db.Resource;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/SysdynConnectionClass.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/SysdynConnectionClass.java
index 79899e87..e9fc9702 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/connections/SysdynConnectionClass.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/connections/SysdynConnectionClass.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.connections;
+package org.simantics.sysdyn.ui.elements.connections;
 
 import java.awt.Color;
 import java.awt.Composite;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/IssueDecorationStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/IssueDecorationStyle.java
similarity index 96%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/IssueDecorationStyle.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/IssueDecorationStyle.java
index 50aab8c6..8942a926 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/IssueDecorationStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/IssueDecorationStyle.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.profiles;
+package org.simantics.sysdyn.ui.elements.profiles;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/SimulationPlaybackStyle.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/SimulationPlaybackStyle.java
similarity index 97%
rename from org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/SimulationPlaybackStyle.java
rename to org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/SimulationPlaybackStyle.java
index 89ef64d3..bb595851 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements2/profiles/SimulationPlaybackStyle.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/elements/profiles/SimulationPlaybackStyle.java
@@ -9,7 +9,7 @@
  * Contributors:
  *     VTT Technical Research Centre of Finland - initial API and implementation
  *******************************************************************************/
-package org.simantics.sysdyn.ui.elements2.profiles;
+package org.simantics.sysdyn.ui.elements.profiles;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Rectangle2D;
diff --git a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/DependencyTab.java b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/DependencyTab.java
index 7ebec21a..d480a2d2 100644
--- a/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/DependencyTab.java
+++ b/org.simantics.sysdyn.ui/src/org/simantics/sysdyn/ui/properties/DependencyTab.java
@@ -32,7 +32,7 @@ import org.simantics.db.WriteGraph;
 import org.simantics.db.exception.DatabaseException;
 import org.simantics.db.management.ISessionContext;
 import org.simantics.sysdyn.SysdynResource;
-import org.simantics.sysdyn.ui.elements2.connections.DependencyNode;
+import org.simantics.sysdyn.ui.elements.connections.DependencyNode;
 import org.simantics.utils.datastructures.Pair;
 import org.simantics.utils.datastructures.Triple;
 
-- 
2.47.1