diff --git a/PNlib/IA.mo b/PNlib/Components/IA.mo
similarity index 97%
rename from PNlib/IA.mo
rename to PNlib/Components/IA.mo
index 0fcef7bf..361d50fc 100644
--- a/PNlib/IA.mo
+++ b/PNlib/Components/IA.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.Components;
 model IA "Inhibitor Arc"
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   parameter Real testValue=1 "marking that has to be deceeded to enable firing" annotation(Dialog(enable = true, group = "Inhibitor Arc"));
@@ -39,7 +39,7 @@ model IA "Inhibitor Arc"
             {48, 36}}), iconTransformation(extent={{28, 16},
             {48, 36}})));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Integer testValueInt "integer test value (for generating events!)";
 equation
   if outTransition.disPlace then
diff --git a/PNlib/PC.mo b/PNlib/Components/PC.mo
similarity index 97%
rename from PNlib/PC.mo
rename to PNlib/Components/PC.mo
index 8744cfd8..2dc39fd0 100644
--- a/PNlib/PC.mo
+++ b/PNlib/Components/PC.mo
@@ -1,8 +1,8 @@
-within PNlib;
+within PNlib.Components;
 model PC "Continuous Place"
   Real t "marking";
-  parameter Integer nIn=0 "number of input transitions" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut=0 "number of output transitions" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input transitions" annotation(Dialog(enable=true,group="Connector sizing"));
+parameter Integer nOut(min=0)= 0 "number of output transitions" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   parameter Real startMarks = 0 "start marks" annotation(Dialog(enable = true, group = "Marks"));
   parameter Real minMarks = 0 "minimum capacity" annotation(Dialog(enable = true, group = "Marks"));
@@ -35,7 +35,7 @@ model PC "Continuous Place"
   parameter Integer localSeedIn = PNlib.Functions.Random.counter() "Local seed to initialize random number generator for input conflicts" annotation(Dialog(enable = true, group = "Random Number Generator"));
   parameter Integer localSeedOut = PNlib.Functions.Random.counter() "Local seed to initialize random number generator for output conflicts" annotation(Dialog(enable = true, group = "Random Number Generator"));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Real disMarkChange "discrete mark change";
   Real conMarkChange "continuous mark change";
   Real arcWeightIn[nIn] "weights of input arcs";
diff --git a/PNlib/PD.mo b/PNlib/Components/PD.mo
similarity index 96%
rename from PNlib/PD.mo
rename to PNlib/Components/PD.mo
index 50990243..35e5cd5c 100644
--- a/PNlib/PD.mo
+++ b/PNlib/Components/PD.mo
@@ -1,8 +1,8 @@
-within PNlib;
+within PNlib.Components;
 model PD "Discrete Place"
   discrete Integer t(start = startTokens, fixed=true) "marking";
-  parameter Integer nIn=0 "number of input transitions" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut=0 "number of output transitions" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input transitions" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output transitions" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   parameter Integer startTokens = 0 "start tokens" annotation(Dialog(enable = true, group = "Tokens"));
   parameter Integer minTokens = 0 "minimum capacity" annotation(Dialog(enable = true, group = "Tokens"));
@@ -37,7 +37,7 @@ model PD "Discrete Place"
   parameter Integer localSeedIn = PNlib.Functions.Random.counter() "Local seed to initialize random number generator for input conflicts" annotation(Dialog(enable = true, group = "Random Number Generator"));
   parameter Integer localSeedOut = PNlib.Functions.Random.counter() "Local seed to initialize random number generator for output conflicts" annotation(Dialog(enable = true, group = "Random Number Generator"));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Real tokenscale "only for place animation and display";
   discrete Integer pret "pre marking";
   Integer arcWeightIn[nIn] "Integer weights of input arcs";
diff --git a/PNlib/Settings.mo b/PNlib/Components/Settings.mo
similarity index 99%
rename from PNlib/Settings.mo
rename to PNlib/Components/Settings.mo
index c62a5c11..c908c748 100644
--- a/PNlib/Settings.mo
+++ b/PNlib/Components/Settings.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.Components;
 model Settings "Global Settings for Animation and Display"
   parameter Boolean showPlaceName=true "show names of places" annotation(Dialog(enable = true, group = "Display"));
   parameter Boolean showTransitionName=true "show names of transitions" annotation(Dialog(enable = true, group = "Display"));
diff --git a/PNlib/T.mo b/PNlib/Components/T.mo
similarity index 94%
rename from PNlib/T.mo
rename to PNlib/Components/T.mo
index 178608ca..a7087be5 100644
--- a/PNlib/T.mo
+++ b/PNlib/Components/T.mo
@@ -1,14 +1,14 @@
-within PNlib;
-model T "Discrete Transition with delay "
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+within PNlib.Components;
+model T "immediate Transition"
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   Real arcWeightIn[nIn] = fill(1, nIn) "arc weights of input places" annotation(Dialog(enable = true, group = "Arc Weights"));
   Real arcWeightOut[nOut] = fill(1, nOut) "arc weights of output places" annotation(Dialog(enable = true, group = "Arc Weights"));
   Boolean firingCon=true "additional firing condition" annotation(Dialog(enable = true, group = "Firing Condition"));
   //****MODIFIABLE PARAMETERS AND VARIABLES END****//
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Boolean showTransitionName=settings.showTransitionName "only for transition animation and display (Do not change!)";
   Boolean showDelay=settings.showTime "only for transition animation and display (Do not change!)";
   Real color[3] "only for transition animation and display (Do not change!)";
diff --git a/PNlib/TA.mo b/PNlib/Components/TA.mo
similarity index 97%
rename from PNlib/TA.mo
rename to PNlib/Components/TA.mo
index 38f9fa00..9eefe9a9 100644
--- a/PNlib/TA.mo
+++ b/PNlib/Components/TA.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.Components;
 model TA "Test Arc"
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   parameter Real testValue=1 "marking that has to be exceeded to enable firing" annotation(Dialog(enable = true, group = "Test Arc"));
@@ -32,7 +32,7 @@ model TA "Test Arc"
     normalArc=normalArc,
     speedSum=inPlace.speedSum) "connector for transition" annotation(Placement(transformation(extent={{28, 16}, {48, 36}}), iconTransformation(extent={{28, 16}, {48, 36}})));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Integer testValueInt "integer test value (for generating events!)";
 equation
   if outTransition.disPlace then
diff --git a/PNlib/TC.mo b/PNlib/Components/TC.mo
similarity index 95%
rename from PNlib/TC.mo
rename to PNlib/Components/TC.mo
index 067cccf2..b618b607 100644
--- a/PNlib/TC.mo
+++ b/PNlib/Components/TC.mo
@@ -1,7 +1,7 @@
-within PNlib;
+within PNlib.Components;
 model TC "Continuous Transition"
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   Real maximumSpeed=1 "maximum speed" annotation(Dialog(enable = true, group = "Maximum Speed"));
   Real arcWeightIn[nIn]=fill(1, nIn) "arc weights of input places" annotation(Dialog(enable = true, group = "Arc Weights"));
@@ -15,7 +15,7 @@ model TC "Continuous Transition"
   Boolean animateSpeed=settings.animateSpeed "only for transition animation and display (Do not change!)";
   Real color[3] "only for transition animation and display (Do not change!)";
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Real prelimSpeed "preliminary speed";
   Real tIn[nIn] "tokens of input places";
   Real tOut[nOut] "tokens of output places";
diff --git a/PNlib/TD.mo b/PNlib/Components/TD.mo
similarity index 95%
rename from PNlib/TD.mo
rename to PNlib/Components/TD.mo
index 447a4b41..e54f76b5 100644
--- a/PNlib/TD.mo
+++ b/PNlib/Components/TD.mo
@@ -1,7 +1,7 @@
-within PNlib;
+within PNlib.Components;
 model TD "Discrete Transition with delay "
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   Real delay = 1 "delay of timed transition" annotation(Dialog(enable = true, group = "Delay"));
   Real arcWeightIn[nIn] = fill(1, nIn) "arc weights of input places" annotation(Dialog(enable = true, group = "Arc Weights"));
@@ -9,7 +9,7 @@ model TD "Discrete Transition with delay "
   Boolean firingCon=true "additional firing condition" annotation(Dialog(enable = true, group = "Firing Condition"));
   //****MODIFIABLE PARAMETERS AND VARIABLES END****//
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Boolean showTransitionName=settings.showTransitionName "only for transition animation and display (Do not change!)";
   Boolean showDelay=settings.showTime "only for transition animation and display (Do not change!)";
   Real color[3] "only for transition animation and display (Do not change!)";
diff --git a/PNlib/TDS.mo b/PNlib/Components/TDS.mo
similarity index 97%
rename from PNlib/TDS.mo
rename to PNlib/Components/TDS.mo
index b81dd0e8..67e7b498 100644
--- a/PNlib/TDS.mo
+++ b/PNlib/Components/TDS.mo
@@ -1,8 +1,8 @@
-within PNlib;
+within PNlib.Components;
 model TDS "Stochastic Transition with delay"
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   parameter PNlib.Types.DistributionType distributionType=PNlib.Types.DistributionType.Exponential
     "distribution type of delay" annotation(Dialog(enable = true, group = "Distribution"));
   Real h=1
@@ -40,7 +40,7 @@ model TDS "Stochastic Transition with delay"
 protected
   discrete Integer state128[4] "state of random number generator";
   Real r128 "random number";
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   discrete Real fireTime "for transition animation";
   Real tIn[nIn] "tokens of input places";
   Real tOut[nOut] "tokens of output places";
diff --git a/PNlib/TE.mo b/PNlib/Components/TE.mo
similarity index 95%
rename from PNlib/TE.mo
rename to PNlib/Components/TE.mo
index 6cc16433..672b3840 100644
--- a/PNlib/TE.mo
+++ b/PNlib/Components/TE.mo
@@ -1,7 +1,7 @@
-within PNlib;
+within PNlib.Components;
 model TE "Discrete Transition with event"
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   Real event[:] = {1,2,3} "Event time of timed transition" annotation(Dialog(enable = true, group = "Event"));
   Real arcWeightIn[nIn] = fill(1, nIn) "arc weights of input places" annotation(Dialog(enable = true, group = "Arc Weights"));
@@ -9,7 +9,7 @@ model TE "Discrete Transition with event"
   Boolean firingCon=true "additional firing condition" annotation(Dialog(enable = true, group = "Firing Condition"));
   //****MODIFIABLE PARAMETERS AND VARIABLES END****//
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Boolean showTransitionName=settings.showTransitionName "only for transition animation and display (Do not change!)";
   Boolean showevent=settings.showTime "only for transition animation and display (Do not change!)";
   Real color[3] "only for transition animation and display (Do not change!)";
diff --git a/PNlib/TES.mo b/PNlib/Components/TES.mo
similarity index 97%
rename from PNlib/TES.mo
rename to PNlib/Components/TES.mo
index 9cfa17aa..7b5828c1 100644
--- a/PNlib/TES.mo
+++ b/PNlib/Components/TES.mo
@@ -1,8 +1,8 @@
-within PNlib;
+within PNlib.Components;
 model TES "Stochastic Transition with event"
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   parameter PNlib.Types.DistributionType distributionType=PNlib.Types.DistributionType.Exponential
     "distribution type of event" annotation(Dialog(enable = true, group = "Distribution"));
   Real h=1
@@ -40,7 +40,7 @@ model TES "Stochastic Transition with event"
 protected
   discrete Integer state128[4] "state of random number generator";
   Real r128 "random number";
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   discrete Real fireTime "for transition animation";
   Real tIn[nIn] "tokens of input places";
   Real tOut[nOut] "tokens of output places";
diff --git a/PNlib/TFD.mo b/PNlib/Components/TFD.mo
similarity index 95%
rename from PNlib/TFD.mo
rename to PNlib/Components/TFD.mo
index 88ac4b43..e3e458f0 100644
--- a/PNlib/TFD.mo
+++ b/PNlib/Components/TFD.mo
@@ -1,7 +1,7 @@
-within PNlib;
+within PNlib.Components;
 model TFD "Discrete Transition with fire duration"
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   Real duration = 1 "duration of timed transition" annotation(Dialog(enable = true, group = "Duration"));
   Real arcWeightIn[nIn] = fill(1, nIn) "arc weights of input places" annotation(Dialog(enable = true, group = "Arc Weights"));
@@ -9,7 +9,7 @@ model TFD "Discrete Transition with fire duration"
   Boolean firingCon=true "additional firing condition" annotation(Dialog(enable = true, group = "Firing Condition"));
   //****MODIFIABLE PARAMETERS AND VARIABLES END****//
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Boolean showTransitionName=settings.showTransitionName "only for transition animation and display (Do not change!)";
   Boolean showDuration=settings.showTime "only for transition animation and display (Do not change!)";
   Real color[3] "only for transition animation and display (Do not change!)";
diff --git a/PNlib/TFDS.mo b/PNlib/Components/TFDS.mo
similarity index 97%
rename from PNlib/TFDS.mo
rename to PNlib/Components/TFDS.mo
index 6c1a78e3..556e0ce7 100644
--- a/PNlib/TFDS.mo
+++ b/PNlib/Components/TFDS.mo
@@ -1,8 +1,8 @@
-within PNlib;
+within PNlib.Components;
 model TFDS "Stochastic Transition with fire duration"
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   parameter  PNlib.Types.DistributionType distributionType= PNlib.Types.DistributionType.Exponential
     "distribution type of duration" annotation(Dialog(enable = true, group = "Distribution"));
   Real h=1
@@ -36,7 +36,7 @@ model TFDS "Stochastic Transition with fire duration"
 protected
   discrete Integer state128[4] "state of random number generator";
   Real r128 "random number";
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Real firingTimeIn "next putative firing time";
   Real firingTimeOut "next putative firing time";
   discrete Real fireTime "for transition animation";
diff --git a/PNlib/TT.mo b/PNlib/Components/TT.mo
similarity index 95%
rename from PNlib/TT.mo
rename to PNlib/Components/TT.mo
index df92db35..d91b90fb 100644
--- a/PNlib/TT.mo
+++ b/PNlib/Components/TT.mo
@@ -1,7 +1,7 @@
-within PNlib;
+within PNlib.Components;
 model TT "Discrete Transition"
-  parameter Integer nIn = 0 "number of input places" annotation(Dialog(connectorSizing=true));
-  parameter Integer nOut = 0 "number of output places" annotation(Dialog(connectorSizing=true));
+  parameter Integer nIn(min=0)= 0 "number of input places" annotation(Dialog(enable=true,group="Connector sizing"));
+  parameter Integer nOut(min=0)= 0 "number of output places" annotation(Dialog(enable=true,group="Connector sizing"));
   //****MODIFIABLE PARAMETERS AND VARIABLES BEGIN****//
   parameter Real tactIntervall = 1 "tact intervall of timed transition" annotation(Dialog(enable = true, group = "Takt"));
   parameter Real tactStart = 1 "tact start of timed transition" annotation(Dialog(enable = true, group = "Takt"));
@@ -12,7 +12,7 @@ model TT "Discrete Transition"
   Boolean firingCon=true "additional firing condition" annotation(Dialog(enable = true, group = "Firing Condition"));
   //****MODIFIABLE PARAMETERS AND VARIABLES END****//
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Boolean showTransitionName=settings.showTransitionName
     "only for transition animation and display (Do not change!)";
   Boolean showTakt=settings.showTime
diff --git a/PNlib/Components/package.mo b/PNlib/Components/package.mo
new file mode 100644
index 00000000..331f4602
--- /dev/null
+++ b/PNlib/Components/package.mo
@@ -0,0 +1,5 @@
+within PNlib;
+package Components "Contains component models to compose models of petri nets."
+    extends Modelica.Icons.Package;
+
+end Components;
diff --git a/PNlib/Components/package.order b/PNlib/Components/package.order
new file mode 100644
index 00000000..e7f6a6a0
--- /dev/null
+++ b/PNlib/Components/package.order
@@ -0,0 +1,14 @@
+PD
+PC
+T
+TD
+TDS
+TE
+TES
+TFD
+TFDS
+TT
+TC
+TA
+IA
+Settings
diff --git a/PNlib/Examples/ConTest/Conflict.mo b/PNlib/Examples/ConTest/Conflict.mo
index 27a420d6..f6eaae7d 100644
--- a/PNlib/Examples/ConTest/Conflict.mo
+++ b/PNlib/Examples/ConTest/Conflict.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.ConTest;
 model Conflict
   extends Modelica.Icons.Example;
 
-  PNlib.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
+  PNlib.Components.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
             -20, 10}})));
-  PNlib.TC T2(maximumSpeed = 2, nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{20, 10},
+  PNlib.Components.TC T2(maximumSpeed = 2, nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{20, 10},
             {40, 30}})));
-  PNlib.TC T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{20, -30},
+  PNlib.Components.TC T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{20, -30},
             {40, -10}})));
-  PNlib.PC P1(nIn = 1, nOut = 2) annotation(Placement(transformation(extent={{-10, -10},
+  PNlib.Components.PC P1(nIn = 1, nOut = 2) annotation(Placement(transformation(extent={{-10, -10},
             {10, 10}})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent={{50, 10}, {70,
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent={{50, 10}, {70,
             30}})));
-  PNlib.PC P3(nIn = 1) annotation(Placement(transformation(extent={{50, -30}, {70,
+  PNlib.Components.PC P3(nIn = 1) annotation(Placement(transformation(extent={{50, -30}, {70,
             -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-40, 20},
             {-20, 40}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-25.2, 0},
diff --git a/PNlib/Examples/ConTest/ConflictLoop.mo b/PNlib/Examples/ConTest/ConflictLoop.mo
index d3e05224..97763aa2 100644
--- a/PNlib/Examples/ConTest/ConflictLoop.mo
+++ b/PNlib/Examples/ConTest/ConflictLoop.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.ConTest;
 model ConflictLoop
   extends Modelica.Icons.Example;
 
-  PNlib.TC T1(nOut = 1, nIn = 2, arcWeightOut = {3}, arcWeightIn = {2, 1}) annotation(Placement(transformation(extent={{-60, -10},
+  PNlib.Components.TC T1(nOut = 1, nIn = 2, arcWeightOut = {3}, arcWeightIn = {2, 1}) annotation(Placement(transformation(extent={{-60, -10},
             {-40, 10}})));
-  PNlib.TC T2(nIn = 1, nOut = 1, maximumSpeed = 4) annotation(Placement(transformation(extent={{0, 10}, {
+  PNlib.Components.TC T2(nIn = 1, nOut = 1, maximumSpeed = 4) annotation(Placement(transformation(extent={{0, 10}, {
             20, 30}})));
-  PNlib.TC T3(nIn = 1, nOut = 1, maximumSpeed = 2) annotation(Placement(transformation(extent={{2, -30},
+  PNlib.Components.TC T3(nIn = 1, nOut = 1, maximumSpeed = 2) annotation(Placement(transformation(extent={{2, -30},
             {22, -10}})));
-  PNlib.PC P1(nIn = 1, nOut = 2) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PC P1(nIn = 1, nOut = 2) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.PC P2(nIn = 1, nOut = 1, startMarks = 2) annotation(Placement(transformation(extent={{30, 10},
+  PNlib.Components.PC P2(nIn = 1, nOut = 1, startMarks = 2) annotation(Placement(transformation(extent={{30, 10},
             {50, 30}})));
-  PNlib.PC P3(nIn = 1, nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{30, -30},
+  PNlib.Components.PC P3(nIn = 1, nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{30, -30},
             {50, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{30, 50},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{30, 50},
             {50, 70}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-45.2, 0},
diff --git a/PNlib/Examples/ConTest/LoopAndArcweight.mo b/PNlib/Examples/ConTest/LoopAndArcweight.mo
index 38167c1e..efff43d6 100644
--- a/PNlib/Examples/ConTest/LoopAndArcweight.mo
+++ b/PNlib/Examples/ConTest/LoopAndArcweight.mo
@@ -2,14 +2,14 @@ within PNlib.Examples.ConTest;
 model LoopAndArcweight
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-40, 20},
             {-20, 40}})));
-  PNlib.PC P1(nOut = 1, nIn = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
+  PNlib.Components.PC P1(nOut = 1, nIn = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
             {10, 10}},
         rotation=180,
         origin={0, -30})));
-  PNlib.TC T1(nIn = 1, nOut = 2, arcWeightIn = {3}, arcWeightOut = {2, 2}) annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation=180, origin={0, 0})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {-10, 10}}, rotation=270, origin={20, 30})));
+  PNlib.Components.TC T1(nIn = 1, nOut = 2, arcWeightIn = {3}, arcWeightOut = {2, 2}) annotation(Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation=180, origin={0, 0})));
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {-10, 10}}, rotation=270, origin={20, 30})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-10.8,
           -30}, {-20, -30}, {-20, 4.44089e-016}, {-4.8, 4.44089e-016}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/ConTest/PCtoTC.mo b/PNlib/Examples/ConTest/PCtoTC.mo
index 2a3df8f7..36a5a869 100644
--- a/PNlib/Examples/ConTest/PCtoTC.mo
+++ b/PNlib/Examples/ConTest/PCtoTC.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.ConTest;
 model PCtoTC
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PC P1(nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
+  PNlib.Components.PC P1(nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
             {10, 10}})));
-  PNlib.TC T1(nIn = 1) annotation(Placement(transformation(extent={{20, -10}, {40,
+  PNlib.Components.TC T1(nIn = 1) annotation(Placement(transformation(extent={{20, -10}, {40,
             10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{10.8, 0},
diff --git a/PNlib/Examples/ConTest/PCtoTCfunction.mo b/PNlib/Examples/ConTest/PCtoTCfunction.mo
index 53838665..d8054ffe 100644
--- a/PNlib/Examples/ConTest/PCtoTCfunction.mo
+++ b/PNlib/Examples/ConTest/PCtoTCfunction.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.ConTest;
 model PCtoTCfunction
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PC P1(nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
+  PNlib.Components.PC P1(nOut = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10},
             {10, 10}})));
-  PNlib.TC T1(arcWeightIn = {P1.t}, nIn = 1) annotation(Placement(transformation(extent={{20, -10}, {40,
+  PNlib.Components.TC T1(arcWeightIn = {P1.t}, nIn = 1) annotation(Placement(transformation(extent={{20, -10}, {40,
             10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{10.8, 0},
diff --git a/PNlib/Examples/ConTest/SinglePC.mo b/PNlib/Examples/ConTest/SinglePC.mo
index 2cc95273..0db14350 100644
--- a/PNlib/Examples/ConTest/SinglePC.mo
+++ b/PNlib/Examples/ConTest/SinglePC.mo
@@ -2,7 +2,7 @@ within PNlib.Examples.ConTest;
 model SinglePC
   extends Modelica.Icons.Example;
 
-  PNlib.PC P1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PC P1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   annotation(Diagram(coordinateSystem(extent={{-40, -40}, {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime=0.0, StopTime=1.0, Tolerance = 1e-6));
 end SinglePC;
diff --git a/PNlib/Examples/ConTest/SingleTC.mo b/PNlib/Examples/ConTest/SingleTC.mo
index 3bdeb426..758afd53 100644
--- a/PNlib/Examples/ConTest/SingleTC.mo
+++ b/PNlib/Examples/ConTest/SingleTC.mo
@@ -2,7 +2,7 @@ within PNlib.Examples.ConTest;
 model SingleTC
   extends Modelica.Icons.Example;
 
-  PNlib.TC T1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TC T1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   annotation(Diagram(coordinateSystem(extent={{-40, -40}, {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime=0.0, StopTime=1.0, Tolerance = 1e-6));
 end SingleTC;
diff --git a/PNlib/Examples/ConTest/Speed.mo b/PNlib/Examples/ConTest/Speed.mo
index 644cce9c..35593ab0 100644
--- a/PNlib/Examples/ConTest/Speed.mo
+++ b/PNlib/Examples/ConTest/Speed.mo
@@ -2,17 +2,17 @@ within PNlib.Examples.ConTest;
 model Speed
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{60, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{60, 20},
             {80, 40}})));
-  PNlib.TC T1(nOut = 1, maximumSpeed = 2) annotation(Placement(transformation(extent={{-40, 10},
+  PNlib.Components.TC T1(nOut = 1, maximumSpeed = 2) annotation(Placement(transformation(extent={{-40, 10},
             {-20, 30}})));
-  PNlib.PC P1(nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{-10, -10},
+  PNlib.Components.PC P1(nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{-10, -10},
             {10, 10}})));
-  PNlib.TC T2(nOut = 1, arcWeightOut = {2}) annotation(Placement(transformation(extent={{-40, -30},
+  PNlib.Components.TC T2(nOut = 1, arcWeightOut = {2}) annotation(Placement(transformation(extent={{-40, -30},
             {-20, -10}})));
-  PNlib.TC T3(nIn = 1, nOut = 1, arcWeightIn = {4}, arcWeightOut = {4}) annotation(Placement(transformation(extent={{20, -10},
+  PNlib.Components.TC T3(nIn = 1, nOut = 1, arcWeightIn = {4}, arcWeightOut = {4}) annotation(Placement(transformation(extent={{20, -10},
             {40, 10}})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent={{50, -10}, {70,
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent={{50, -10}, {70,
             10}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-25.2,
diff --git a/PNlib/Examples/ConTest/TCtoPC.mo b/PNlib/Examples/ConTest/TCtoPC.mo
index d3cfabb8..70f9803f 100644
--- a/PNlib/Examples/ConTest/TCtoPC.mo
+++ b/PNlib/Examples/ConTest/TCtoPC.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.ConTest;
 model TCtoPC
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
+  PNlib.Components.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
             -20, 10}})));
-  PNlib.PC P1(nIn = 1) annotation(Placement(transformation(extent={{-10, -10}, {
+  PNlib.Components.PC P1(nIn = 1) annotation(Placement(transformation(extent={{-10, -10}, {
             10, 10}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-25.2, 0},
diff --git a/PNlib/Examples/ConTest/TCtoPCfunction.mo b/PNlib/Examples/ConTest/TCtoPCfunction.mo
index 5af6cb8e..a76e3154 100644
--- a/PNlib/Examples/ConTest/TCtoPCfunction.mo
+++ b/PNlib/Examples/ConTest/TCtoPCfunction.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.ConTest;
 model TCtoPCfunction
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.TC T1(arcWeightOut = {P1.t}, nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
+  PNlib.Components.TC T1(arcWeightOut = {P1.t}, nOut = 1) annotation(Placement(transformation(extent={{-40, -10}, {
             -20, 10}})));
-  PNlib.PC P1(nIn = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10}, {
+  PNlib.Components.PC P1(nIn = 1, startMarks = 1) annotation(Placement(transformation(extent={{-10, -10}, {
             10, 10}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-25.2, 0},
diff --git a/PNlib/Examples/ConTest/ZeroArcWeight.mo b/PNlib/Examples/ConTest/ZeroArcWeight.mo
index a60414de..a123b81a 100644
--- a/PNlib/Examples/ConTest/ZeroArcWeight.mo
+++ b/PNlib/Examples/ConTest/ZeroArcWeight.mo
@@ -2,15 +2,15 @@ within PNlib.Examples.ConTest;
 model ZeroArcWeight
   extends Modelica.Icons.Example;
 
-  PNlib.PC P1(nOut=1)
+  PNlib.Components.PC P1(nOut=1)
     annotation(Placement(transformation(extent={{-50, 10}, {-30, 30}})));
-  PNlib.PC P2(nOut=1, startMarks=10)
+  PNlib.Components.PC P2(nOut=1, startMarks=10)
     annotation(Placement(transformation(extent={{-50, -30}, {-30, -10}})));
-  PNlib.TC T1(nIn=2, nOut=1, arcWeightIn={0, 1})
+  PNlib.Components.TC T1(nIn=2, nOut=1, arcWeightIn={0, 1})
     annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
-  PNlib.PC P3(nIn=1)
+  PNlib.Components.PC P3(nIn=1)
     annotation(Placement(transformation(extent={{30, -10}, {50, 10}})));
-  inner Settings settings
+  inner PNlib.Components.Settings settings
     annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-29.2, 20},
diff --git a/PNlib/Examples/ConTest/ZeroPlace.mo b/PNlib/Examples/ConTest/ZeroPlace.mo
index e7ee1008..25b153c0 100644
--- a/PNlib/Examples/ConTest/ZeroPlace.mo
+++ b/PNlib/Examples/ConTest/ZeroPlace.mo
@@ -2,15 +2,15 @@ within PNlib.Examples.ConTest;
 model ZeroPlace
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
-  PNlib.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {
+  PNlib.Components.TC T1(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {
             -40, 10}})));
-  PNlib.PC P1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PC P1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TC T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -10},
+  PNlib.Components.TC T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -10},
             {20, 10}})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent={{30, -10}, {50,
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent={{30, -10}, {50,
             10}})));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-45.2, 0},
diff --git a/PNlib/Examples/DisTest/ConflictBeneBaB.mo b/PNlib/Examples/DisTest/ConflictBeneBaB.mo
index 450abae7..30ed84c0 100644
--- a/PNlib/Examples/DisTest/ConflictBeneBaB.mo
+++ b/PNlib/Examples/DisTest/ConflictBeneBaB.mo
@@ -1,29 +1,29 @@
 within PNlib.Examples.DisTest;
 model ConflictBeneBaB
   extends Modelica.Icons.Example;
-  PNlib.PD P1(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, 70}, {50, 90}}, rotation = 0)));
-  PNlib.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-6, 70}, {14, 90}}, rotation = 0)));
-  PNlib.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-6, 30}, {14, 50}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, 30}, {50, 50}}, rotation = 0)));
-  PNlib.PD P3(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, -10}, {50, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{-60, 80}, {-40, 100}}, rotation = 0)));
-  PNlib.TD T3(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.PD P1(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, 70}, {50, 90}}, rotation = 0)));
+  PNlib.Components.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-6, 70}, {14, 90}}, rotation = 0)));
+  PNlib.Components.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-6, 30}, {14, 50}}, rotation = 0)));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, 30}, {50, 50}}, rotation = 0)));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{30, -10}, {50, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{-60, 80}, {-40, 100}}, rotation = 0)));
+  PNlib.Components.TD T3(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {4, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T4(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TD T4(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {4, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T5(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TD T5(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {4, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P4(nIn = 1)  annotation(
+  PNlib.Components.PD P4(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -40}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PD P5(maxTokens = 1,nIn = 1, nOut = 1, startTokens = 1)  annotation(
+  PNlib.Components.PD P5(maxTokens = 1,nIn = 1, nOut = 1, startTokens = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -80}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PD P7(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneOut = {6, 5, 3, 4, 2, 0}, enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 6, startTokens = 4)  annotation(
+  PNlib.Components.PD P7(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneOut = {6, 5, 3, 4, 2, 0}, enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 6, startTokens = 4)  annotation(
     Placement(visible = true, transformation(origin = {-30, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T7(arcWeightOut = {4},delay = 2, nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TD T7(arcWeightOut = {4},delay = 2, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 90)));
-  PNlib.TD T6(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TD T6(arcWeightIn = {1},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {4, -120}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P6(nIn = 1)  annotation(
+  PNlib.Components.PD P6(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -120}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T6.inPlaces[1], P7.outTransition[6]) annotation(
diff --git a/PNlib/Examples/DisTest/ConflictBeneGreedy.mo b/PNlib/Examples/DisTest/ConflictBeneGreedy.mo
index 7fa0a4ca..efbe5442 100644
--- a/PNlib/Examples/DisTest/ConflictBeneGreedy.mo
+++ b/PNlib/Examples/DisTest/ConflictBeneGreedy.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.DisTest;
 model ConflictBeneGreedy
   extends Modelica.Icons.Example;
-  PNlib.PD P1(enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 2, startTokens = 2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PD P1(enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 2, startTokens = 2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/DisTest/ConflictBeneQuotient.mo b/PNlib/Examples/DisTest/ConflictBeneQuotient.mo
index 5b8c0f12..3308ec80 100644
--- a/PNlib/Examples/DisTest/ConflictBeneQuotient.mo
+++ b/PNlib/Examples/DisTest/ConflictBeneQuotient.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.DisTest;
 model ConflictBeneQuotient
   extends Modelica.Icons.Example;
-  PNlib.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient, enablingBeneOut = {10, 7}, enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 2, startTokens = 9) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(arcWeightIn = {5},nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(arcWeightOut = {4}, nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient, enablingBeneOut = {10, 7}, enablingType = PNlib.Types.EnablingType.Benefit,nIn = 1, nOut = 2, startTokens = 9) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(arcWeightIn = {5},nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TD T3(arcWeightOut = {4}, nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/DisTest/ConflictPrio.mo b/PNlib/Examples/DisTest/ConflictPrio.mo
index c8ca507c..29b1c6e8 100644
--- a/PNlib/Examples/DisTest/ConflictPrio.mo
+++ b/PNlib/Examples/DisTest/ConflictPrio.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.DisTest;
 model ConflictPrio
   extends Modelica.Icons.Example;
-  PNlib.PD P1(nIn = 1, nOut = 2, startTokens = 2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PD P1(nIn = 1, nOut = 2, startTokens = 2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/DisTest/ConflictProb.mo b/PNlib/Examples/DisTest/ConflictProb.mo
index a9aa3ea7..dda950aa 100644
--- a/PNlib/Examples/DisTest/ConflictProb.mo
+++ b/PNlib/Examples/DisTest/ConflictProb.mo
@@ -2,24 +2,24 @@ within PNlib.Examples.DisTest;
 model ConflictProb
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(nIn = 1, startTokens = 2, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, enablingProbOut = {0.5, 0.5},
+  PNlib.Components.PD P1(nIn = 1, startTokens = 2, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, enablingProbOut = {0.5, 0.5},
     localSeedIn=1,
     localSeedOut=2)                                                                               annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
             20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
             {20, -10}})));
-  PNlib.PD P2(nIn = 1,
+  PNlib.Components.PD P2(nIn = 1,
     localSeedIn=3,
     localSeedOut=4)    annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1,
+  PNlib.Components.PD P3(nIn = 1,
     localSeedIn=5,
     localSeedOut=6)    annotation(Placement(transformation(extent={{30, -30}, {50,
             -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
             10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 20},
             {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-45.2, 0},
diff --git a/PNlib/Examples/DisTest/DisLoopAndArcweight.mo b/PNlib/Examples/DisTest/DisLoopAndArcweight.mo
index 7464329b..db26f272 100644
--- a/PNlib/Examples/DisTest/DisLoopAndArcweight.mo
+++ b/PNlib/Examples/DisTest/DisLoopAndArcweight.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.DisTest;
 model DisLoopAndArcweight
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(nOut = 1, nIn = 1, startTokens = 2) annotation(Placement(transformation(extent={{-10, -30},
+  PNlib.Components.PD P1(nOut = 1, nIn = 1, startTokens = 2) annotation(Placement(transformation(extent={{-10, -30},
             {10, -10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1, arcWeightIn = {2}, arcWeightOut = {3}) annotation(Placement(transformation(extent={{8, 10}, {
+  PNlib.Components.TD T1(nIn = 1, nOut = 1, arcWeightIn = {2}, arcWeightOut = {3}) annotation(Placement(transformation(extent={{8, 10}, {
             -12, 30}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 40},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 40},
             {40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{10.8, -20},
diff --git a/PNlib/Examples/DisTest/EightConflictProb.mo b/PNlib/Examples/DisTest/EightConflictProb.mo
index 4d9af0f3..97eb73f7 100644
--- a/PNlib/Examples/DisTest/EightConflictProb.mo
+++ b/PNlib/Examples/DisTest/EightConflictProb.mo
@@ -2,22 +2,22 @@ within PNlib.Examples.DisTest;
 model EightConflictProb
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(startTokens = 1, enablingType = PNlib.Types.EnablingType.Probability, nOut = 8,
+  PNlib.Components.PD P1(startTokens = 1, enablingType = PNlib.Types.EnablingType.Probability, nOut = 8,
     localSeedIn=1,
     localSeedOut=2)                                        annotation(Placement(transformation(extent={{-50, -10},
             {-30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{-20, 30}, {0, 50}})));
-  PNlib.TD T2(nIn = 1) annotation(Placement(transformation(extent={{0, 10}, {20, 30}})));
-  PNlib.TD T3(nIn = 1) annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PNlib.TD T4(nIn = 1) annotation(Placement(transformation(extent={{40, 10}, {60, 30}})));
-  PNlib.TD T5(nIn = 1) annotation(Placement(transformation(extent={{40, -30}, {60,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{-20, 30}, {0, 50}})));
+  PNlib.Components.TD T2(nIn = 1) annotation(Placement(transformation(extent={{0, 10}, {20, 30}})));
+  PNlib.Components.TD T3(nIn = 1) annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.TD T4(nIn = 1) annotation(Placement(transformation(extent={{40, 10}, {60, 30}})));
+  PNlib.Components.TD T5(nIn = 1) annotation(Placement(transformation(extent={{40, -30}, {60,
             -10}})));
-  PNlib.TD T6(nIn = 1) annotation(Placement(transformation(extent={{-20, -50}, {0,
+  PNlib.Components.TD T6(nIn = 1) annotation(Placement(transformation(extent={{-20, -50}, {0,
             -30}})));
-  PNlib.TD T7(nIn = 1) annotation(Placement(transformation(extent={{20, -40}, {40,
+  PNlib.Components.TD T7(nIn = 1) annotation(Placement(transformation(extent={{20, -40}, {40,
             -20}})));
-  PNlib.TD T8(nIn = 1) annotation(Placement(transformation(extent={{0, -30}, {20, -10}})));
-  inner PNlib.Settings settings
+  PNlib.Components.TD T8(nIn = 1) annotation(Placement(transformation(extent={{0, -30}, {20, -10}})));
+  inner PNlib.Components.Settings settings
     annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-29.2, -0.875},
diff --git a/PNlib/Examples/DisTest/FiveTimes.mo b/PNlib/Examples/DisTest/FiveTimes.mo
index 60363784..7687ae56 100644
--- a/PNlib/Examples/DisTest/FiveTimes.mo
+++ b/PNlib/Examples/DisTest/FiveTimes.mo
@@ -1,39 +1,39 @@
 within PNlib.Examples.DisTest;
 model FiveTimes
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings
+  inner PNlib.Components.Settings settings
     annotation(Placement(visible = true, transformation(extent = {{-60, 80}, {-40, 100}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1, nOut = 1, startTokens = 3)  annotation(
+  PNlib.Components.PD P1(nIn = 1, nOut = 1, startTokens = 3)  annotation(
     Placement(visible = true, transformation(origin = {-30, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1)  annotation(
+  PNlib.Components.PD P2(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {30, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P3(nIn = 1, nOut = 1, startTokens = 3)  annotation(
+  PNlib.Components.PD P3(nIn = 1, nOut = 1, startTokens = 3)  annotation(
     Placement(visible = true, transformation(origin = {-30, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P4(nIn = 1)  annotation(
+  PNlib.Components.PD P4(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {30, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P5( nIn = 1, nOut = 1, startTokens = 3)  annotation(
+  PNlib.Components.PD P5( nIn = 1, nOut = 1, startTokens = 3)  annotation(
     Placement(visible = true, transformation(origin = {-30, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P6(nIn = 1)  annotation(
+  PNlib.Components.PD P6(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {30, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P7(nIn = 1, nOut = 1, startTokens = 3)  annotation(
+  PNlib.Components.PD P7(nIn = 1, nOut = 1, startTokens = 3)  annotation(
     Placement(visible = true, transformation(origin = {-30, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P8(nIn = 1)  annotation(
+  PNlib.Components.PD P8(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {30, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T1(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TD T1(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {0, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T2(event = {1, 3, 4, 5, 6, 9}, nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TE T2(event = {1, 3, 4, 5, 6, 9}, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {0, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T3(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TFD T3(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {0, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TT T4(nIn = 1, nOut = 1, tactStart = 2)  annotation(
+  PNlib.Components.TT T4(nIn = 1, nOut = 1, tactStart = 2)  annotation(
     Placement(visible = true, transformation(origin = {0, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T6(arcWeightOut = {3, 3, 3, 3, 3}, event = {5.5}, nOut = 5)  annotation(
+  PNlib.Components.TE T6(arcWeightOut = {3, 3, 3, 3, 3}, event = {5.5}, nOut = 5)  annotation(
     Placement(visible = true, transformation(origin = {-70, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P9(nIn = 1, nOut = 1, startMarks = 3)  annotation(
+  PNlib.Components.PC P9(nIn = 1, nOut = 1, startMarks = 3)  annotation(
     Placement(visible = true, transformation(origin = {-30, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P10(nIn = 1)  annotation(
+  PNlib.Components.PC P10(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {30, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T5(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TC T5(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {0, -100}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T6.outPlaces[5], P9.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/InputConflictBeneBaB.mo b/PNlib/Examples/DisTest/InputConflictBeneBaB.mo
index d46b9a49..f1402cd0 100644
--- a/PNlib/Examples/DisTest/InputConflictBeneBaB.mo
+++ b/PNlib/Examples/DisTest/InputConflictBeneBaB.mo
@@ -2,18 +2,18 @@ within PNlib.Examples.DisTest;
 model InputConflictBeneBaB
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneIn = {6, 5}, enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 5, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
+  PNlib.Components.PD P1(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneIn = {6, 5}, enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 5, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
             {30, 10}})));
-  PNlib.TD T1(arcWeightIn = {3}, nIn = 1) annotation(Placement(visible = true, transformation(extent = {{40, -10}, {60, 10}}, rotation = 0)));
-  PNlib.TD T2(arcWeightOut = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
+  PNlib.Components.TD T1(arcWeightIn = {3}, nIn = 1) annotation(Placement(visible = true, transformation(extent = {{40, -10}, {60, 10}}, rotation = 0)));
+  PNlib.Components.TD T2(arcWeightOut = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
             {0, 30}})));
-  PNlib.TD T3(arcWeightOut = {2},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
+  PNlib.Components.TD T3(arcWeightOut = {2},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
             {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
             {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
             {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
 equation
   connect(T1.inPlaces[1], P1.outTransition[1]) annotation(Line(points = {{45, 0}, {30.8, 0}}));
diff --git a/PNlib/Examples/DisTest/InputConflictBeneGreedy.mo b/PNlib/Examples/DisTest/InputConflictBeneGreedy.mo
index 6c27de7d..ea164db1 100644
--- a/PNlib/Examples/DisTest/InputConflictBeneGreedy.mo
+++ b/PNlib/Examples/DisTest/InputConflictBeneGreedy.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 model InputConflictBeneGreedy
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(enablingBeneIn = {1, 2},enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 2, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
+  PNlib.Components.PD P1(enablingBeneIn = {1, 2},enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 2, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
             {30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
             10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
             {0, 30}})));
-  PNlib.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
+  PNlib.Components.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
             {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
             {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
             {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{-29.2, 20},
diff --git a/PNlib/Examples/DisTest/InputConflictBeneQuotient.mo b/PNlib/Examples/DisTest/InputConflictBeneQuotient.mo
index b03c4eac..6c051478 100644
--- a/PNlib/Examples/DisTest/InputConflictBeneQuotient.mo
+++ b/PNlib/Examples/DisTest/InputConflictBeneQuotient.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 model InputConflictBeneQuotient
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient,enablingBeneIn = {6, 5}, enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 5, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
+  PNlib.Components.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient,enablingBeneIn = {6, 5}, enablingType = PNlib.Types.EnablingType.Benefit,maxTokens = 5, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
             {30, 10}})));
-  PNlib.TD T1(arcWeightIn = {3}, nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
+  PNlib.Components.TD T1(arcWeightIn = {3}, nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
             10}})));
-  PNlib.TD T2(arcWeightOut = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
+  PNlib.Components.TD T2(arcWeightOut = {3},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
             {0, 30}})));
-  PNlib.TD T3(arcWeightOut = {2},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
+  PNlib.Components.TD T3(arcWeightOut = {2},nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
             {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
             {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
             {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{-29.2, 20},
diff --git a/PNlib/Examples/DisTest/InputConflictPrio.mo b/PNlib/Examples/DisTest/InputConflictPrio.mo
index 2af03e74..372a96d7 100644
--- a/PNlib/Examples/DisTest/InputConflictPrio.mo
+++ b/PNlib/Examples/DisTest/InputConflictPrio.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 model InputConflictPrio
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(maxTokens = 2, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
+  PNlib.Components.PD P1(maxTokens = 2, nIn = 2, nOut = 1) annotation(Placement(transformation(extent={{10, -10},
             {30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
             10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
             {0, 30}})));
-  PNlib.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
+  PNlib.Components.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
             {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, 10},
             {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent={{-50, -30},
             {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{-29.2, 20},
diff --git a/PNlib/Examples/DisTest/InputConflictProb.mo b/PNlib/Examples/DisTest/InputConflictProb.mo
index afc24e17..b1b5ff5f 100644
--- a/PNlib/Examples/DisTest/InputConflictProb.mo
+++ b/PNlib/Examples/DisTest/InputConflictProb.mo
@@ -2,25 +2,25 @@ within PNlib.Examples.DisTest;
 model InputConflictProb
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(maxTokens = 2, nIn = 2, nOut = 1, enablingType = PNlib.Types.EnablingType.Probability,
+  PNlib.Components.PD P1(maxTokens = 2, nIn = 2, nOut = 1, enablingType = PNlib.Types.EnablingType.Probability,
     localSeedIn=1,
     localSeedOut=2)                                               annotation(Placement(transformation(extent={{10, -10},
             {30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{40, -10}, {60,
             10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, 10},
             {0, 30}})));
-  PNlib.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
+  PNlib.Components.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{-20, -30},
             {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1,
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1,
     localSeedIn=3,
     localSeedOut=4)                      annotation(Placement(transformation(extent={{-50, 10},
             {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1,
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1,
     localSeedIn=5,
     localSeedOut=6)                                        annotation(Placement(transformation(extent={{-50, -30},
             {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{40, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{40, 20},
             {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{-29.2, 20},
diff --git a/PNlib/Examples/DisTest/NoInputConflict.mo b/PNlib/Examples/DisTest/NoInputConflict.mo
index 1a820398..ea6e62d8 100644
--- a/PNlib/Examples/DisTest/NoInputConflict.mo
+++ b/PNlib/Examples/DisTest/NoInputConflict.mo
@@ -1,11 +1,11 @@
 within PNlib.Examples.DisTest;
 model NoInputConflict
   extends Modelica.Icons.Example;
-  PNlib.TD T1(nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-30, 10}, {-10, 30}}, rotation = 0)));
-  PNlib.TD T2(delay = 2, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-30, -30}, {-10, -10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 20},
+  PNlib.Components.TD T1(nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-30, 10}, {-10, 30}}, rotation = 0)));
+  PNlib.Components.TD T2(delay = 2, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{-30, -30}, {-10, -10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 20},
             {-40, 40}})));
-  PNlib.PD P1(enablingPrioIn = {2, 1}, maxTokens = 1, nIn = 2)  annotation(
+  PNlib.Components.PD P1(enablingPrioIn = {2, 1}, maxTokens = 1, nIn = 2)  annotation(
     Placement(visible = true, transformation(origin = {16, 2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/OutputConflictBeneBaB.mo b/PNlib/Examples/DisTest/OutputConflictBeneBaB.mo
index 46c4e0ed..ad37fdb4 100644
--- a/PNlib/Examples/DisTest/OutputConflictBeneBaB.mo
+++ b/PNlib/Examples/DisTest/OutputConflictBeneBaB.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 
 model OutputConflictBeneBaB
   extends Modelica.Icons.Example;
-  PNlib.PD P1(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneOut = {8, 7}, enablingType = PNlib.Types.EnablingType.Benefit, minTokens = 8, nIn = 1, nOut = 2, startTokens = 15) annotation(
+  PNlib.Components.PD P1(benefitType = PNlib.Types.BenefitType.BranchAndBound, enablingBeneOut = {8, 7}, enablingType = PNlib.Types.EnablingType.Benefit, minTokens = 8, nIn = 1, nOut = 2, startTokens = 15) annotation(
     Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(
+  PNlib.Components.PD P3(nIn = 1) annotation(
     Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(arcWeightOut = {2}, nOut = 1) annotation(
+  PNlib.Components.TD T3(arcWeightOut = {2}, nOut = 1) annotation(
     Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/OutputConflictBeneGreedy.mo b/PNlib/Examples/DisTest/OutputConflictBeneGreedy.mo
index 41cb98c7..a7f65090 100644
--- a/PNlib/Examples/DisTest/OutputConflictBeneGreedy.mo
+++ b/PNlib/Examples/DisTest/OutputConflictBeneGreedy.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 
 model OutputConflictBeneGreedy
   extends Modelica.Icons.Example;
-  PNlib.PD P1(enablingBeneOut = {2, 1}, enablingType = PNlib.Types.EnablingType.Benefit,minTokens = 2, nIn = 1, nOut = 2, startTokens = 2) annotation(
+  PNlib.Components.PD P1(enablingBeneOut = {2, 1}, enablingType = PNlib.Types.EnablingType.Benefit,minTokens = 2, nIn = 1, nOut = 2, startTokens = 2) annotation(
     Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(
+  PNlib.Components.PD P3(nIn = 1) annotation(
     Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(
+  PNlib.Components.TD T3(nOut = 1) annotation(
     Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/OutputConflictBeneQuotient.mo b/PNlib/Examples/DisTest/OutputConflictBeneQuotient.mo
index 0b5ccaf6..1dec2513 100644
--- a/PNlib/Examples/DisTest/OutputConflictBeneQuotient.mo
+++ b/PNlib/Examples/DisTest/OutputConflictBeneQuotient.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 
 model OutputConflictBeneQuotient
   extends Modelica.Icons.Example;
-  PNlib.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient, enablingBeneOut = {8, 7}, enablingType = PNlib.Types.EnablingType.Benefit, minTokens = 8, nIn = 1, nOut = 2, startTokens = 8) annotation(
+  PNlib.Components.PD P1(benefitType = PNlib.Types.BenefitType.BenefitQuotient, enablingBeneOut = {8, 7}, enablingType = PNlib.Types.EnablingType.Benefit, minTokens = 8, nIn = 1, nOut = 2, startTokens = 8) annotation(
     Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T1(arcWeightIn = {4},nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T2(arcWeightIn = {3},nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(
+  PNlib.Components.PD P3(nIn = 1) annotation(
     Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(arcWeightOut = {2}, nOut = 1) annotation(
+  PNlib.Components.TD T3(arcWeightOut = {2}, nOut = 1) annotation(
     Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/OutputConflictPrio.mo b/PNlib/Examples/DisTest/OutputConflictPrio.mo
index 6e6288ae..867d1244 100644
--- a/PNlib/Examples/DisTest/OutputConflictPrio.mo
+++ b/PNlib/Examples/DisTest/OutputConflictPrio.mo
@@ -2,18 +2,18 @@ within PNlib.Examples.DisTest;
 model OutputConflictPrio
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(nIn = 1, startTokens = 2, nOut = 2, minTokens = 2) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PD P1(nIn = 1, startTokens = 2, nOut = 2, minTokens = 2) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
             20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
             {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent={{30, -30}, {50,
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent={{30, -30}, {50,
             -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
             10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 20},
             {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-45.2, 0},
diff --git a/PNlib/Examples/DisTest/OutputConflictProb.mo b/PNlib/Examples/DisTest/OutputConflictProb.mo
index a8790921..acd0aa50 100644
--- a/PNlib/Examples/DisTest/OutputConflictProb.mo
+++ b/PNlib/Examples/DisTest/OutputConflictProb.mo
@@ -2,24 +2,24 @@ within PNlib.Examples.DisTest;
 model OutputConflictProb
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(nIn = 1, startTokens = 2, nOut = 2, enablingProbOut = {0.5, 0.5}, minTokens = 2, enablingType = PNlib.Types.EnablingType.Probability,
+  PNlib.Components.PD P1(nIn = 1, startTokens = 2, nOut = 2, enablingProbOut = {0.5, 0.5}, minTokens = 2, enablingType = PNlib.Types.EnablingType.Probability,
     localSeedIn=1,
     localSeedOut=2)                                                                                              annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, 10}, {
             20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent={{0, -30},
             {20, -10}})));
-  PNlib.PD P2(nIn = 1,
+  PNlib.Components.PD P2(nIn = 1,
     localSeedIn=3,
     localSeedOut=4)    annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1,
+  PNlib.Components.PD P3(nIn = 1,
     localSeedIn=5,
     localSeedOut=6)    annotation(Placement(transformation(extent={{30, -30}, {50,
             -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent={{-60, -10}, {-40,
             10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 20},
             {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-45.2, 0},
diff --git a/PNlib/Examples/DisTest/PDtoTD.mo b/PNlib/Examples/DisTest/PDtoTD.mo
index 26203e1b..ffcc83ba 100644
--- a/PNlib/Examples/DisTest/PDtoTD.mo
+++ b/PNlib/Examples/DisTest/PDtoTD.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.DisTest;
 model PDtoTD
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {30,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {30,
             10}})));
 equation
   connect(T1.inPlaces[1], P1.outTransition[1]) annotation(Line(points={{15.2, 0},
diff --git a/PNlib/Examples/DisTest/PDtoTDfunction.mo b/PNlib/Examples/DisTest/PDtoTDfunction.mo
index e3df229d..15e377b3 100644
--- a/PNlib/Examples/DisTest/PDtoTDfunction.mo
+++ b/PNlib/Examples/DisTest/PDtoTDfunction.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.DisTest;
 model PDtoTDfunction
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  PNlib.TD T1(arcWeightIn = {P1.t}, nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {30,
+  PNlib.Components.TD T1(arcWeightIn = {P1.t}, nIn = 1) annotation(Placement(transformation(extent={{10, -10}, {30,
             10}})));
 equation
   connect(T1.inPlaces[1], P1.outTransition[1]) annotation(Line(points={{15.2, 0},
diff --git a/PNlib/Examples/DisTest/PDtoTT.mo b/PNlib/Examples/DisTest/PDtoTT.mo
index 5198f764..2be635c2 100644
--- a/PNlib/Examples/DisTest/PDtoTT.mo
+++ b/PNlib/Examples/DisTest/PDtoTT.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.DisTest;
 model PDtoTT
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
+  PNlib.Components.PD P1(nOut = 1, startTokens = 10) annotation(Placement(transformation(extent={{-30, -10},
             {-10, 10}})));
-  TT T1(nIn = 1)  annotation(
+  PNlib.Components.TT T1(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {18, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(
diff --git a/PNlib/Examples/DisTest/PrioTest.mo b/PNlib/Examples/DisTest/PrioTest.mo
index cbdf46e4..91225801 100644
--- a/PNlib/Examples/DisTest/PrioTest.mo
+++ b/PNlib/Examples/DisTest/PrioTest.mo
@@ -1,17 +1,17 @@
 within PNlib.Examples.DisTest;
 model PrioTest
  extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{-60, 40}, {-40, 60}}, rotation = 0)));
- PD P1(enablingPrioOut = {4, 3, 2, 1},nIn = 1, nOut = 4, startTokens = 1)  annotation(Placement(visible = true, transformation(origin = {-26, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- TD T1(nOut = 1)  annotation(Placement(visible = true, transformation(origin = {-52, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PNlib.TD T2(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, 46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PNlib.TD T3(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, 16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PNlib.TD T4(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, -16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- TD T5(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PD P2(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, 46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PD P3(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, 16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PD P4(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, -16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
- PD P5(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{-60, 40}, {-40, 60}}, rotation = 0)));
+ PNlib.Components.PD P1(enablingPrioOut = {4, 3, 2, 1},nIn = 1, nOut = 4, startTokens = 1)  annotation(Placement(visible = true, transformation(origin = {-26, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.TD T1(nOut = 1)  annotation(Placement(visible = true, transformation(origin = {-52, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.TD T2(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, 46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.TD T3(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, 16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.TD T4(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, -16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.TD T5(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {16, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.PD P2(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, 46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.PD P3(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, 16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.PD P4(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, -16}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+ PNlib.Components.PD P5(maxTokens = 1, nIn = 1)  annotation(Placement(visible = true, transformation(origin = {40, -46}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T5.outPlaces[1], P5.inTransition[1]) annotation(Line(points = {{20, -46}, {30, -46}, {30, -46}, {30, -46}}));
   connect(T4.outPlaces[1], P4.inTransition[1]) annotation(Line(points = {{20, -16}, {28, -16}, {28, -16}, {30, -16}}));
@@ -23,5 +23,5 @@ equation
   connect(P1.outTransition[2], T3.inPlaces[1]) annotation(Line(points = {{-16, -2}, {0, -2}, {0, 16}, {11, 16}}));
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-48, -2}, {-38, -2}, {-38, -2}, {-36, -2}}));
   annotation(Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-60, -60}, {60, 60}}), graphics), experiment(StartTime = 0.0, StopTime = 5.0, Tolerance = 1e-6));
- 
+
 end PrioTest;
diff --git a/PNlib/Examples/DisTest/SinglePD.mo b/PNlib/Examples/DisTest/SinglePD.mo
index 04b4aa65..038e6264 100644
--- a/PNlib/Examples/DisTest/SinglePD.mo
+++ b/PNlib/Examples/DisTest/SinglePD.mo
@@ -2,8 +2,8 @@ within PNlib.Examples.DisTest;
 model SinglePD
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1 annotation(Placement(visible = true, transformation(origin={0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PD P1 annotation(Placement(visible = true, transformation(origin={0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   annotation(Diagram(coordinateSystem(extent={{-40, -40},
             {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime=0.0, StopTime=1.0, Tolerance = 1e-6));
 end SinglePD;
diff --git a/PNlib/Examples/DisTest/SingleTD.mo b/PNlib/Examples/DisTest/SingleTD.mo
index cde0bbd6..7355e9a3 100644
--- a/PNlib/Examples/DisTest/SingleTD.mo
+++ b/PNlib/Examples/DisTest/SingleTD.mo
@@ -2,8 +2,8 @@ within PNlib.Examples.DisTest;
 model SingleTD
   extends Modelica.Icons.Example;
 
-  PNlib.TD T1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TD T1 annotation(Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
   annotation(Diagram(coordinateSystem(extent={{-40, -40},
             {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime=0.0, StopTime=1.0, Tolerance = 1e-6));
 end SingleTD;
diff --git a/PNlib/Examples/DisTest/SixConflictProb.mo b/PNlib/Examples/DisTest/SixConflictProb.mo
index a2a89986..84bb11ad 100644
--- a/PNlib/Examples/DisTest/SixConflictProb.mo
+++ b/PNlib/Examples/DisTest/SixConflictProb.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 model SixConflictProb
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(startTokens = 1, enablingType = PNlib.Types.EnablingType.Probability, nOut = 6,
+  PNlib.Components.PD P1(startTokens = 1, enablingType = PNlib.Types.EnablingType.Probability, nOut = 6,
     localSeedIn=1,
     localSeedOut=2)                                        annotation(Placement(transformation(extent={{-50, -10},
             {-30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent={{-20, 30}, {0, 50}})));
-  PNlib.TD T2(nIn = 1) annotation(Placement(transformation(extent={{0, 20}, {20, 40}})));
-  PNlib.TD T3(nIn = 1) annotation(Placement(transformation(extent={{20, 10}, {40, 30}})));
-  PNlib.TD T4(nIn = 1) annotation(Placement(transformation(extent={{20, -30}, {40,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent={{-20, 30}, {0, 50}})));
+  PNlib.Components.TD T2(nIn = 1) annotation(Placement(transformation(extent={{0, 20}, {20, 40}})));
+  PNlib.Components.TD T3(nIn = 1) annotation(Placement(transformation(extent={{20, 10}, {40, 30}})));
+  PNlib.Components.TD T4(nIn = 1) annotation(Placement(transformation(extent={{20, -30}, {40,
             -10}})));
-  PNlib.TD T5(nIn = 1) annotation(Placement(transformation(extent={{0, -40}, {20, -20}})));
-  PNlib.TD T6(nIn = 1) annotation(Placement(transformation(extent={{-20, -50}, {0,
+  PNlib.Components.TD T5(nIn = 1) annotation(Placement(transformation(extent={{0, -40}, {20, -20}})));
+  PNlib.Components.TD T6(nIn = 1) annotation(Placement(transformation(extent={{-20, -50}, {0,
             -30}})));
-  inner PNlib.Settings settings
+  inner PNlib.Components.Settings settings
     annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-29.2,
diff --git a/PNlib/Examples/DisTest/TDtoPD.mo b/PNlib/Examples/DisTest/TDtoPD.mo
index 5c288718..8fefadf6 100644
--- a/PNlib/Examples/DisTest/TDtoPD.mo
+++ b/PNlib/Examples/DisTest/TDtoPD.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.DisTest;
 model TDtoPD
   extends Modelica.Icons.Example;
 
-  PNlib.PD P1(nOut = 0, nIn = 1) annotation(Placement(visible = true, transformation(origin={20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T1(nOut = 1) annotation(Placement(visible = true, transformation(origin={-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PD P1(nOut = 0, nIn = 1) annotation(Placement(visible = true, transformation(origin={20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TD T1(nOut = 1) annotation(Placement(visible = true, transformation(origin={-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin={30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.inTransition[1], T1.outPlaces[1]) annotation(Line(points={{9.2, 0}, {
           9.2, 0}, {-15.2, 0}}));
diff --git a/PNlib/Examples/DisTest/TDtoPDfunction.mo b/PNlib/Examples/DisTest/TDtoPDfunction.mo
index 07ac8b81..c0676303 100644
--- a/PNlib/Examples/DisTest/TDtoPDfunction.mo
+++ b/PNlib/Examples/DisTest/TDtoPDfunction.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.DisTest;
 
 model TDtoPDfunction
   extends Modelica.Icons.Example;
-  PNlib.PD P1(nIn = 1, nOut = 0, startTokens = 1) annotation(
+  PNlib.Components.PD P1(nIn = 1, nOut = 0, startTokens = 1) annotation(
     Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T1(arcWeightOut = {P1.t}, nOut = 1) annotation(
+  PNlib.Components.TD T1(arcWeightOut = {P1.t}, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(origin = {30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.inTransition[1], T1.outPlaces[1]) annotation(
diff --git a/PNlib/Examples/DisTest/TEnoInput.mo b/PNlib/Examples/DisTest/TEnoInput.mo
index c21cb791..b3dd8602 100644
--- a/PNlib/Examples/DisTest/TEnoInput.mo
+++ b/PNlib/Examples/DisTest/TEnoInput.mo
@@ -1,9 +1,9 @@
 within PNlib.Examples.DisTest;
 model TEnoInput
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{20, 20}, {40, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent={{10, -10}, {30, 10}},                                                                                                               rotation = 0)));
-  PNlib.TE T2(event = {0.5, 2.5, 2.8}, nOut = 1)  annotation (
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{20, 20}, {40, 40}}, rotation = 0)));
+  PNlib.Components.PD P1(nIn = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent={{10, -10}, {30, 10}},                                                                                                               rotation = 0)));
+  PNlib.Components.TE T2(event = {0.5, 2.5, 2.8}, nOut = 1)  annotation (
     Placement(visible = true, transformation(origin={-24,0},      extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T2.outPlaces[1], P1.inTransition[1]) annotation (
diff --git a/PNlib/Examples/DisTest/TEtest.mo b/PNlib/Examples/DisTest/TEtest.mo
index 2f3b155e..b82c3ab7 100644
--- a/PNlib/Examples/DisTest/TEtest.mo
+++ b/PNlib/Examples/DisTest/TEtest.mo
@@ -1,12 +1,12 @@
 within PNlib.Examples.DisTest;
 model TEtest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{60, 20}, {80, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1,nOut = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent = {{-20, 10}, {0, 30}}, rotation = 0)));
-  PNlib.TE T1(nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{20, 10}, {40, 30}}, rotation = 0)));
-  PNlib.TE T2(event = {0.5, 2.5, 2.8}, nIn = 1, nOut = 1)  annotation(
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{60, 20}, {80, 40}}, rotation = 0)));
+  PNlib.Components.PD P1(nIn = 1,nOut = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent = {{-20, 10}, {0, 30}}, rotation = 0)));
+  PNlib.Components.TE T1(nIn = 1, nOut = 1) annotation(Placement(visible = true, transformation(extent = {{20, 10}, {40, 30}}, rotation = 0)));
+  PNlib.Components.TE T2(event = {0.5, 2.5, 2.8}, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-54, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1, nOut = 1, startTokens = 1)  annotation(
+  PNlib.Components.PD P2(nIn = 1, nOut = 1, startTokens = 1)  annotation(
     Placement(visible = true, transformation(origin = {-10, -20}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 equation
   connect(P2.inTransition[1], T1.outPlaces[1]) annotation(
diff --git a/PNlib/Examples/DisTest/TFDinputConflict.mo b/PNlib/Examples/DisTest/TFDinputConflict.mo
index a1e943ed..1dc91a46 100644
--- a/PNlib/Examples/DisTest/TFDinputConflict.mo
+++ b/PNlib/Examples/DisTest/TFDinputConflict.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 
 model TFDinputConflict
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{40, 20}, {60, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1, nOut = 1, startTokens = 0) annotation(
+  PNlib.Components.PD P1(nIn = 1, nOut = 1, startTokens = 0) annotation(
     Placement(visible = true, transformation(extent = {{-34, -28}, {-14, -8}}, rotation = 0)));
-  PNlib.PD P2(enablingPrioIn = {2, 1}, maxTokens = 1, nIn = 2, nOut = 1, startTokens = 0) annotation(
+  PNlib.Components.PD P2(enablingPrioIn = {2, 1}, maxTokens = 1, nIn = 2, nOut = 1, startTokens = 0) annotation(
     Placement(visible = true, transformation(origin = {22, -18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TFD T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-2, -18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T2(event = {1, 2.5, 3.8}, nOut = 1)  annotation(
+  PNlib.Components.TE T2(event = {1, 2.5, 3.8}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-50, -18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T3(event = {1.8, 2.3, 3.9}, nIn = 1)  annotation(
+  PNlib.Components.TE T3(event = {1.8, 2.3, 3.9}, nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {44, -18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TE T4(event = {1.5, 3.5}, nOut = 1)  annotation(
+  PNlib.Components.TE T4(event = {1.5, 3.5}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-2, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T4.outPlaces[1], P2.inTransition[2]) annotation(
diff --git a/PNlib/Examples/DisTest/TFDoutCap.mo b/PNlib/Examples/DisTest/TFDoutCap.mo
index d83a3ca2..999e54d1 100644
--- a/PNlib/Examples/DisTest/TFDoutCap.mo
+++ b/PNlib/Examples/DisTest/TFDoutCap.mo
@@ -2,17 +2,17 @@ within PNlib.Examples.DisTest;
 
 model TFDoutCap
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{40, 20}, {60, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1, nOut = 1, startTokens = 0) annotation(
+  PNlib.Components.PD P1(nIn = 1, nOut = 1, startTokens = 0) annotation(
     Placement(visible = true, transformation(extent = {{-34, -10}, {-14, 10}}, rotation = 0)));
-  PNlib.PD P2(maxTokens = 1, nIn = 1, nOut = 1, startTokens = 1) annotation(
+  PNlib.Components.PD P2(maxTokens = 1, nIn = 1, nOut = 1, startTokens = 1) annotation(
     Placement(visible = true, transformation(origin = {22, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TFD T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-2, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T2(event = {1, 2.5, 3.8}, nOut = 1)  annotation(
+  PNlib.Components.TE T2(event = {1, 2.5, 3.8}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-50, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T3(event = {1.5, 4}, nIn = 1)  annotation(
+  PNlib.Components.TE T3(event = {1.5, 4}, nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {44, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T2.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/TFDoutputConflict.mo b/PNlib/Examples/DisTest/TFDoutputConflict.mo
index 5f3c406a..9ef00379 100644
--- a/PNlib/Examples/DisTest/TFDoutputConflict.mo
+++ b/PNlib/Examples/DisTest/TFDoutputConflict.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.DisTest;
 
 model TFDoutputConflict
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{40, 20}, {60, 40}}, rotation = 0)));
-  PNlib.PD P1(enablingType = PNlib.Types.EnablingType.Probability, localSeedIn = 1, localSeedOut = 2,nIn = 1, nOut = 2, startTokens = 0) annotation(
+  PNlib.Components.PD P1(enablingType = PNlib.Types.EnablingType.Probability, localSeedIn = 1, localSeedOut = 2,nIn = 1, nOut = 2, startTokens = 0) annotation(
     Placement(visible = true, transformation(extent = {{-30, -6}, {-10, 14}}, rotation = 0)));
-  PNlib.PD P2(localSeedIn = 3, localSeedOut = 4, nIn = 1) annotation(
+  PNlib.Components.PD P2(localSeedIn = 3, localSeedOut = 4, nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, 4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TFD T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, 4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T3(nOut = 1)  annotation(
+  PNlib.Components.TD T3(nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-44, 4}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T2(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TFD T2(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {10, -24}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P3(localSeedIn = 5, localSeedOut = 6, nIn = 1)  annotation(
+  PNlib.Components.PD P3(localSeedIn = 5, localSeedOut = 6, nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -24}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(
diff --git a/PNlib/Examples/DisTest/TFDtest.mo b/PNlib/Examples/DisTest/TFDtest.mo
index 2e76159b..1ac4b857 100644
--- a/PNlib/Examples/DisTest/TFDtest.mo
+++ b/PNlib/Examples/DisTest/TFDtest.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.DisTest;
 
 model TFDtest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{20, 20}, {40, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 0, nOut = 1, startTokens = 5) annotation(
+  PNlib.Components.PD P1(nIn = 0, nOut = 1, startTokens = 5) annotation(
     Placement(visible = true, transformation(extent = {{-38, -10}, {-18, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {28, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFD T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TFD T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(
diff --git a/PNlib/Examples/DisTest/TTcircle.mo b/PNlib/Examples/DisTest/TTcircle.mo
index 996bd084..5fbdf155 100644
--- a/PNlib/Examples/DisTest/TTcircle.mo
+++ b/PNlib/Examples/DisTest/TTcircle.mo
@@ -1,11 +1,11 @@
 within PNlib.Examples.DisTest;
 model TTcircle
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{30, 30}, {50, 50}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1,nOut = 1, startTokens = 1) annotation(Placement(visible = true, transformation(extent = {{-30, 8}, {-10, 28}}, rotation = 0)));
-  PNlib.TT T1(nIn = 1, nOut = 1, tactIntervall = 1, tactStart = 0)  annotation(Placement(visible = true, transformation(origin = {0, 18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {22, 18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TT T2(nIn = 1, nOut = 1,tactIntervall = 2, tactStart = 1.5)  annotation(Placement(visible = true, transformation(origin = {0, -22}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{30, 30}, {50, 50}}, rotation = 0)));
+  PNlib.Components.PD P1(nIn = 1,nOut = 1, startTokens = 1) annotation(Placement(visible = true, transformation(extent = {{-30, 8}, {-10, 28}}, rotation = 0)));
+  PNlib.Components.TT T1(nIn = 1, nOut = 1, tactIntervall = 1, tactStart = 0)  annotation(Placement(visible = true, transformation(origin = {0, 18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PD P2(nIn = 1, nOut = 1)  annotation(Placement(visible = true, transformation(origin = {22, 18}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TT T2(nIn = 1, nOut = 1,tactIntervall = 2, tactStart = 1.5)  annotation(Placement(visible = true, transformation(origin = {0, -22}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points = {{4.8, 18}, {12.8, 18}, {12.8, 18}, {12.8, 18}}));
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{33, 18}, {40, 18}, {40, -22}, {4, -22}}));
diff --git a/PNlib/Examples/DisTest/TTtoPD.mo b/PNlib/Examples/DisTest/TTtoPD.mo
index b6140bc4..7d8991ca 100644
--- a/PNlib/Examples/DisTest/TTtoPD.mo
+++ b/PNlib/Examples/DisTest/TTtoPD.mo
@@ -2,10 +2,10 @@ within PNlib.Examples.DisTest;
 model TTtoPD
   extends Modelica.Icons.Example;
 
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20},
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20},
             {40, 40}})));
-  PNlib.PD P1(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{10, -10}, {30, 10}}, rotation = 0)));
-  PNlib.TT T1(nOut = 1)  annotation(
+  PNlib.Components.PD P1(nIn = 1) annotation(Placement(visible = true, transformation(extent = {{10, -10}, {30, 10}}, rotation = 0)));
+  PNlib.Components.TT T1(nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(
diff --git a/PNlib/Examples/DisTest/Ttest.mo b/PNlib/Examples/DisTest/Ttest.mo
index d3db8486..420c48fc 100644
--- a/PNlib/Examples/DisTest/Ttest.mo
+++ b/PNlib/Examples/DisTest/Ttest.mo
@@ -1,21 +1,21 @@
 within PNlib.Examples.DisTest;
 model Ttest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(extent = {{-80, 20}, {-60, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1,nOut = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent = {{-46, -12}, {-26, 8}}, rotation = 0)));
-  PNlib.TE T2(event = {1, 2, 3, 4}, nOut = 1)  annotation(
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(extent = {{-80, 20}, {-60, 40}}, rotation = 0)));
+  PNlib.Components.PD P1(nIn = 1,nOut = 1, startTokens = 0) annotation(Placement(visible = true, transformation(extent = {{-46, -12}, {-26, 8}}, rotation = 0)));
+  PNlib.Components.TE T2(event = {1, 2, 3, 4}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-62, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1, nOut = 2)  annotation(
+  PNlib.Components.PD P2(nIn = 1, nOut = 2)  annotation(
     Placement(visible = true, transformation(origin = {12, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.T T1(arcWeightIn = {2}, arcWeightOut = {3}, nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.T T1(arcWeightIn = {2}, arcWeightOut = {3}, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-12, -2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.T T3(arcWeightIn = {2}, arcWeightOut = {2},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.T T3(arcWeightIn = {2}, arcWeightOut = {2},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, 22}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P3(nIn = 1)  annotation(
+  PNlib.Components.PD P3(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {64, 22}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.T T4(arcWeightIn = {2}, arcWeightOut = {2},nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.T T4(arcWeightIn = {2}, arcWeightOut = {2},nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {42, -22}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD P4(nIn = 1)  annotation(
+  PNlib.Components.PD P4(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {66, -22}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T4.inPlaces[1], P2.outTransition[2]) annotation(
diff --git a/PNlib/Examples/ExtTest/ArcswithPCtoTC.mo b/PNlib/Examples/ExtTest/ArcswithPCtoTC.mo
index 1db4d230..ceea118c 100644
--- a/PNlib/Examples/ExtTest/ArcswithPCtoTC.mo
+++ b/PNlib/Examples/ExtTest/ArcswithPCtoTC.mo
@@ -2,39 +2,39 @@ within PNlib.Examples.ExtTest;
 
 model ArcswithPCtoTC
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{-60, 80}, {-40, 100}}, rotation = 0)));
-  PNlib.PC P1(nOut = 1, startMarks = 1)  annotation(
+  PNlib.Components.PC P1(nOut = 1, startMarks = 1)  annotation(
     Placement(visible = true, transformation(origin = {-40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P2(nIn = 1)  annotation(
+  PNlib.Components.PC P2(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P3(nOut = 1, startMarks = 1)  annotation(
+  PNlib.Components.PC P3(nOut = 1, startMarks = 1)  annotation(
     Placement(visible = true, transformation(origin = {-40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P4(nIn = 1)  annotation(
+  PNlib.Components.PC P4(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P5(nOut = 1, startMarks = 1)  annotation(
+  PNlib.Components.PC P5(nOut = 1, startMarks = 1)  annotation(
     Placement(visible = true, transformation(origin = {-40,-20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P6(nIn = 1)  annotation(
+  PNlib.Components.PC P6(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P7(nOut = 1, startMarks = 1)  annotation(
+  PNlib.Components.PC P7(nOut = 1, startMarks = 1)  annotation(
     Placement(visible = true, transformation(origin = {-40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P8(nIn = 1)  annotation(
+  PNlib.Components.PC P8(nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T1(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TC T1(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {10, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T2(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TC T2(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {10, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T3(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TC T3(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {10, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T4(nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TC T4(nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {10, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TA TA1 annotation(
+  PNlib.Components.TA TA1 annotation(
     Placement(visible = true, transformation(origin = {-6, 58}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.TA TA2(realTestArc = false)  annotation(
+  PNlib.Components.TA TA2(realTestArc = false)  annotation(
     Placement(visible = true, transformation(origin = {-8, 18}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA1 annotation(
+  PNlib.Components.IA IA1 annotation(
     Placement(visible = true, transformation(origin = {-8, -22}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA2(realInhibitorArc = false)  annotation(
+  PNlib.Components.IA IA2(realInhibitorArc = false)  annotation(
     Placement(visible = true, transformation(origin = {-6, -62}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
 equation
   connect(T4.outPlaces[1], P8.inTransition[1]) annotation(
diff --git a/PNlib/Examples/ExtTest/ArcswithPCtoTC2.mo b/PNlib/Examples/ExtTest/ArcswithPCtoTC2.mo
index b94d9bf0..52017562 100644
--- a/PNlib/Examples/ExtTest/ArcswithPCtoTC2.mo
+++ b/PNlib/Examples/ExtTest/ArcswithPCtoTC2.mo
@@ -2,41 +2,41 @@ within PNlib.Examples.ExtTest;
 
 model ArcswithPCtoTC2
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{-100, 60}, {-80, 80}}, rotation = 0)));
-  PNlib.PC P1(maxMarks = 1, nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PC P1(maxMarks = 1, nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P2(nIn = 1) annotation(
+  PNlib.Components.PC P2(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P3(maxMarks = 1, nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PC P3(maxMarks = 1, nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P4(nIn = 1) annotation(
+  PNlib.Components.PC P4(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P5(maxMarks = 1, nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PC P5(maxMarks = 1, nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-40, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P6(nIn = 1) annotation(
+  PNlib.Components.PC P6(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P7(maxMarks = 1, nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PC P7(maxMarks = 1, nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P8(nIn = 1) annotation(
+  PNlib.Components.PC P8(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T2(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T2(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T3(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T3(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T4(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T4(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TA TA1 annotation(
+  PNlib.Components.TA TA1 annotation(
     Placement(visible = true, transformation(origin = {-6, 58}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.TA TA2(realTestArc = false) annotation(
+  PNlib.Components.TA TA2(realTestArc = false) annotation(
     Placement(visible = true, transformation(origin = {-8, 18}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA1 annotation(
+  PNlib.Components.IA IA1 annotation(
     Placement(visible = true, transformation(origin = {-8, -22}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA2(realInhibitorArc = false) annotation(
+  PNlib.Components.IA IA2(realInhibitorArc = false) annotation(
     Placement(visible = true, transformation(origin = {-6, -62}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.TC T5(nOut = 4)  annotation(
+  PNlib.Components.TC T5(nOut = 4)  annotation(
     Placement(visible = true, transformation(origin = {-84, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T5.outPlaces[4], P7.inTransition[1]) annotation(
diff --git a/PNlib/Examples/ExtTest/ArcswithPCtoTC3.mo b/PNlib/Examples/ExtTest/ArcswithPCtoTC3.mo
index 94bcce14..d1849f6d 100644
--- a/PNlib/Examples/ExtTest/ArcswithPCtoTC3.mo
+++ b/PNlib/Examples/ExtTest/ArcswithPCtoTC3.mo
@@ -2,41 +2,41 @@ within PNlib.Examples.ExtTest;
 
 model ArcswithPCtoTC3
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{-100, 60}, {-80, 80}}, rotation = 0)));
-  PNlib.PC P1(minMarks = 1, nOut = 2, startMarks = 2) annotation(
+  PNlib.Components.PC P1(minMarks = 1, nOut = 2, startMarks = 2) annotation(
     Placement(visible = true, transformation(origin = {-40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P2(nIn = 1) annotation(
+  PNlib.Components.PC P2(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P3(minMarks = 1, nOut = 2, startMarks = 2) annotation(
+  PNlib.Components.PC P3(minMarks = 1, nOut = 2, startMarks = 2) annotation(
     Placement(visible = true, transformation(origin = {-40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P4(nIn = 1) annotation(
+  PNlib.Components.PC P4(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P5(minMarks = 1, nOut = 2, startMarks = 2) annotation(
+  PNlib.Components.PC P5(minMarks = 1, nOut = 2, startMarks = 2) annotation(
     Placement(visible = true, transformation(origin = {-40, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P6(nIn = 1) annotation(
+  PNlib.Components.PC P6(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P7(minMarks = 1, nOut = 2, startMarks = 2) annotation(
+  PNlib.Components.PC P7(minMarks = 1, nOut = 2, startMarks = 2) annotation(
     Placement(visible = true, transformation(origin = {-40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P8(nIn = 1) annotation(
+  PNlib.Components.PC P8(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {40, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T1(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T1(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, 60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T2(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T2(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T3(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T3(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, -20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T4(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TC T4(nIn = 1, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {10, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TA TA1 annotation(
+  PNlib.Components.TA TA1 annotation(
     Placement(visible = true, transformation(origin = {-6, 58}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.TA TA2(realTestArc = false) annotation(
+  PNlib.Components.TA TA2(realTestArc = false) annotation(
     Placement(visible = true, transformation(origin = {-8, 18}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA1 annotation(
+  PNlib.Components.IA IA1 annotation(
     Placement(visible = true, transformation(origin = {-8, -22}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.IA IA2(realInhibitorArc = false) annotation(
+  PNlib.Components.IA IA2(realInhibitorArc = false) annotation(
     Placement(visible = true, transformation(origin = {-6, -62}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
-  PNlib.TC T5(nIn = 4, nOut = 0)  annotation(
+  PNlib.Components.TC T5(nIn = 4, nOut = 0)  annotation(
     Placement(visible = true, transformation(origin = {-84, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
 equation
   connect(T5.inPlaces[4], P7.outTransition[2]) annotation(
diff --git a/PNlib/Examples/ExtTest/DoubleArcwithPCtoTC.mo b/PNlib/Examples/ExtTest/DoubleArcwithPCtoTC.mo
index b93fd231..bfefee6e 100644
--- a/PNlib/Examples/ExtTest/DoubleArcwithPCtoTC.mo
+++ b/PNlib/Examples/ExtTest/DoubleArcwithPCtoTC.mo
@@ -1,14 +1,14 @@
 within PNlib.Examples.ExtTest;
 model DoubleArcwithPCtoTC
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  IA IA1(testValue=3, normalArc=false) annotation(Placement(transformation(extent={{-22, 26}, {-8, 32}})));
-  PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
-  PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
-  TA TA1(testValue=2, normalArc=false) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
-  TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.IA IA1(testValue=3, normalArc=false) annotation(Placement(transformation(extent={{-22, 26}, {-8, 32}})));
+  PNlib.Components.PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
+  PNlib.Components.PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
+  PNlib.Components.TA TA1(testValue=2, normalArc=false) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
+  PNlib.Components.TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
   connect(P1.outTransition[1], TA1.inPlace) annotation(Line(points={{-33.2, -0.5}, {-30, -0.5}, {-30, -31}, {-21.1111, -31}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD.mo b/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD.mo
index d0498fd2..77e1a5e6 100644
--- a/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD.mo
+++ b/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD.mo
@@ -1,14 +1,14 @@
 within PNlib.Examples.ExtTest;
 model DoubleArcwithPTtoTD
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  IA IA1(testValue=3, normalArc=false) annotation(Placement(transformation(extent={{-24, 28}, {-12, 32}})));
-  PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -8}, {-34, 12}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -38}, {50, -18}})));
-  TA TA1(normalArc=false, testValue=2) annotation(Placement(transformation(extent={{-20, -32}, {-6, -26}})));
-  TD T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -38}, {26, -18}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.IA IA1(testValue=3, normalArc=false) annotation(Placement(transformation(extent={{-24, 28}, {-12, 32}})));
+  PNlib.Components.PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -8}, {-34, 12}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -38}, {50, -18}})));
+  PNlib.Components.TA TA1(normalArc=false, testValue=2) annotation(Placement(transformation(extent={{-20, -32}, {-6, -26}})));
+  PNlib.Components.TD T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -38}, {26, -18}})));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
   connect(P1.outTransition[1], TA1.inPlace) annotation(Line(points={{-33.2, 1.5}, {-28, 1.5}, {-28, -29}, {-21.1111, -29}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD2.mo b/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD2.mo
index ad55673a..03e5fa23 100644
--- a/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD2.mo
+++ b/PNlib/Examples/ExtTest/DoubleArcwithPTtoTD2.mo
@@ -2,21 +2,21 @@ within PNlib.Examples.ExtTest;
 
 model DoubleArcwithPTtoTD2
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(transformation(extent = {{-60, 40}, {-40, 60}})));
-  IA IA1(normalArc = false, realInhibitorArc = false, testValue = 3) annotation(
+  PNlib.Components.IA IA1(normalArc = false, realInhibitorArc = false, testValue = 3) annotation(
     Placement(transformation(extent = {{-24, 28}, {-12, 32}})));
-  PD P1(nOut = 2, startTokens = 5) annotation(
+  PNlib.Components.PD P1(nOut = 2, startTokens = 5) annotation(
     Placement(transformation(extent = {{-54, -8}, {-34, 12}})));
-  PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(transformation(extent = {{30, 20}, {50, 40}})));
-  PD P3(nIn = 1) annotation(
+  PNlib.Components.PD P3(nIn = 1) annotation(
     Placement(transformation(extent = {{30, -38}, {50, -18}})));
-  TA TA1(normalArc = false, realTestArc = false, testValue = 2) annotation(
+  PNlib.Components.TA TA1(normalArc = false, realTestArc = false, testValue = 2) annotation(
     Placement(transformation(extent = {{-20, -32}, {-6, -26}})));
-  TD T1(nOut = 1, nIn = 1) annotation(
+  PNlib.Components.TD T1(nOut = 1, nIn = 1) annotation(
     Placement(transformation(extent = {{6, 20}, {26, 40}})));
-  TD T2(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{6, -38}, {26, -18}})));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(
diff --git a/PNlib/Examples/ExtTest/IATest.mo b/PNlib/Examples/ExtTest/IATest.mo
index ae75e19e..ad56edba 100644
--- a/PNlib/Examples/ExtTest/IATest.mo
+++ b/PNlib/Examples/ExtTest/IATest.mo
@@ -1,15 +1,15 @@
 within PNlib.Examples.ExtTest;
 model IATest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{100, 20}, {120, 40}})));
-  IA IA1(normalArc=false, testValue=1) annotation(Placement(transformation(extent={{-44, -2}, {-30, 2}})));
-  IA IA2(testValue=2) annotation(Placement(transformation(extent={{-6, -3}, {6, 3}}, rotation=0, origin={50, -1})));
-  PC P1(nOut=2, nIn=1, startMarks=2) annotation(Placement(transformation(extent={{-70, -10}, {-50, 10}})));
-  PC P2(nIn=1, nOut=1, startMarks=1) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
-  PC P3(nIn=1) annotation(Placement(transformation(extent={{90, -10}, {110, 10}})));
-  TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{-20, -10}, {0, 10}})));
-  TC T2(nOut=1, maximumSpeed=1.5) annotation(Placement(transformation(extent={{-100, -10}, {-80, 10}})));
-  TC T3(nIn=2, arcWeightIn={1, 2}, maximumSpeed=2, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}}, rotation=0, origin={80, 0})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{100, 20}, {120, 40}})));
+  PNlib.Components.IA IA1(normalArc=false, testValue=1) annotation(Placement(transformation(extent={{-44, -2}, {-30, 2}})));
+  PNlib.Components.IA IA2(testValue=2) annotation(Placement(transformation(extent={{-6, -3}, {6, 3}}, rotation=0, origin={50, -1})));
+  PNlib.Components.PC P1(nOut=2, nIn=1, startMarks=2) annotation(Placement(transformation(extent={{-70, -10}, {-50, 10}})));
+  PNlib.Components.PC P2(nIn=1, nOut=1, startMarks=1) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
+  PNlib.Components.PC P3(nIn=1) annotation(Placement(transformation(extent={{90, -10}, {110, 10}})));
+  PNlib.Components.TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{-20, -10}, {0, 10}})));
+  PNlib.Components.TC T2(nOut=1, maximumSpeed=1.5) annotation(Placement(transformation(extent={{-100, -10}, {-80, 10}})));
+  PNlib.Components.TC T3(nIn=2, arcWeightIn={1, 2}, maximumSpeed=2, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}}, rotation=0, origin={80, 0})));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{-5.2, 0}, {9.2, 0}}, color={0, 0, 0}));
   connect(P1.outTransition[1], IA1.inPlace) annotation(Line(points={{-49.2, -0.5}, {-48, -0.5}, {-48, 0}, {-45.1111, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/IAwithPCtoTC.mo b/PNlib/Examples/ExtTest/IAwithPCtoTC.mo
index 810da388..87b7a98f 100644
--- a/PNlib/Examples/ExtTest/IAwithPCtoTC.mo
+++ b/PNlib/Examples/ExtTest/IAwithPCtoTC.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model IAwithPCtoTC
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  IA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
-  PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
-  PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
-  TC T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.IA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
+  PNlib.Components.PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
+  PNlib.Components.PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
+  PNlib.Components.TC T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-33.2, -0.5}, {-28, -0.5}, {-28, 30}, {11.2, 30}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/IAwithPDtoTD.mo b/PNlib/Examples/ExtTest/IAwithPDtoTD.mo
index 7ab342cb..e674ff6f 100644
--- a/PNlib/Examples/ExtTest/IAwithPDtoTD.mo
+++ b/PNlib/Examples/ExtTest/IAwithPDtoTD.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model IAwithPDtoTD
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  IA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -36}, {-6, -30}})));
-  PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -12}, {-34, 8}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 18}, {50, 38}})));
-  PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -42}, {50, -22}})));
-  TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 18}, {26, 38}})));
-  TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -42}, {26, -22}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.IA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -36}, {-6, -30}})));
+  PNlib.Components.PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -12}, {-34, 8}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 18}, {50, 38}})));
+  PNlib.Components.PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -42}, {50, -22}})));
+  PNlib.Components.TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 18}, {26, 38}})));
+  PNlib.Components.TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -42}, {26, -22}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-33.2, -2.5}, {-28, -2.5}, {-28, 28}, {11.2, 28}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 28}, {29.2, 28}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/IAwithPDtoTD2.mo b/PNlib/Examples/ExtTest/IAwithPDtoTD2.mo
index 6f7a6ded..98b2e284 100644
--- a/PNlib/Examples/ExtTest/IAwithPDtoTD2.mo
+++ b/PNlib/Examples/ExtTest/IAwithPDtoTD2.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model IAwithPDtoTD2
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  IA TA1(realInhibitorArc = false, testValue = 3) annotation(Placement(transformation(extent={{-20, -36}, {-6, -30}})));
-  PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -12}, {-34, 8}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 18}, {50, 38}})));
-  PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -42}, {50, -22}})));
-  TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 18}, {26, 38}})));
-  TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -42}, {26, -22}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.IA TA1(realInhibitorArc = false, testValue = 3) annotation(Placement(transformation(extent={{-20, -36}, {-6, -30}})));
+  PNlib.Components.PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-54, -12}, {-34, 8}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 18}, {50, 38}})));
+  PNlib.Components.PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -42}, {50, -22}})));
+  PNlib.Components.TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 18}, {26, 38}})));
+  PNlib.Components.TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -42}, {26, -22}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-33.2, -2.5}, {-28, -2.5}, {-28, 28}, {11.2, 28}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 28}, {29.2, 28}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/NoTokens.mo b/PNlib/Examples/ExtTest/NoTokens.mo
index c15796c4..b55b8c43 100644
--- a/PNlib/Examples/ExtTest/NoTokens.mo
+++ b/PNlib/Examples/ExtTest/NoTokens.mo
@@ -2,21 +2,21 @@ within PNlib.Examples.ExtTest;
 
 model NoTokens
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{-100, 60}, {-80, 80}}, rotation = 0)));
-  PNlib.PC P1(nOut = 1, startMarks = 5) annotation(
+  PNlib.Components.PC P1(nOut = 1, startMarks = 5) annotation(
     Placement(visible = true, transformation(origin = {-80, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P3(nOut = 1, startMarks = 5) annotation(
+  PNlib.Components.PC P3(nOut = 1, startMarks = 5) annotation(
     Placement(visible = true, transformation(origin = {-80, -42}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P2(nOut = 2, startMarks = 5) annotation(
+  PNlib.Components.PC P2(nOut = 2, startMarks = 5) annotation(
     Placement(visible = true, transformation(origin = {-80, -6}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T1(nIn = 2, nOut = 1) annotation(
+  PNlib.Components.TC T1(nIn = 2, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-16, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TC T2(nIn = 2, nOut = 1) annotation(
+  PNlib.Components.TC T2(nIn = 2, nOut = 1) annotation(
     Placement(visible = true, transformation(origin = {-16, -30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PC P4(nIn = 2) annotation(
+  PNlib.Components.PC P4(nIn = 2) annotation(
     Placement(visible = true, transformation(origin = {40, 2}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.IA IA1 annotation(
+  PNlib.Components.IA IA1 annotation(
     Placement(visible = true, transformation(origin = {-46, -22}, extent = {{-9.8, 0.4}, {2.8, 4.8}}, rotation = 0)));
 equation
   connect(T2.outPlaces[1], P4.inTransition[2]) annotation(
diff --git a/PNlib/Examples/ExtTest/TATest.mo b/PNlib/Examples/ExtTest/TATest.mo
index a084aebb..90645f0c 100644
--- a/PNlib/Examples/ExtTest/TATest.mo
+++ b/PNlib/Examples/ExtTest/TATest.mo
@@ -1,14 +1,14 @@
 within PNlib.Examples.ExtTest;
 model TATest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{80, 20}, {100, 40}})));
-  PC P1( nOut=2, nIn=1) annotation(Placement(transformation(extent={{-70, -10}, {-50, 10}})));
-  PC P2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
-  TA TA1( normalArc=false, testValue=1) annotation(Placement(transformation(extent={{-44, -2}, {-30, 2}})));
-  TA TA2(testValue=2) annotation(Placement(transformation(extent={{-6, -3}, {6, 3}}, rotation=0, origin={50, -1})));
-  TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{-20, -10}, {0, 10}})));
-  TC T2(nOut=1, maximumSpeed=1.5) annotation(Placement(transformation(extent={{-100, -10}, {-80, 10}})));
-  TC T3(nIn=2, arcWeightIn={1, 2}) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}}, rotation=0, origin={80, 0})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{80, 20}, {100, 40}})));
+  PNlib.Components.PC P1( nOut=2, nIn=1) annotation(Placement(transformation(extent={{-70, -10}, {-50, 10}})));
+  PNlib.Components.PC P2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
+  PNlib.Components.TA TA1( normalArc=false, testValue=1) annotation(Placement(transformation(extent={{-44, -2}, {-30, 2}})));
+  PNlib.Components.TA TA2(testValue=2) annotation(Placement(transformation(extent={{-6, -3}, {6, 3}}, rotation=0, origin={50, -1})));
+  PNlib.Components.TC T1(nOut=1, nIn=1) annotation(Placement(transformation(extent={{-20, -10}, {0, 10}})));
+  PNlib.Components.TC T2(nOut=1, maximumSpeed=1.5) annotation(Placement(transformation(extent={{-100, -10}, {-80, 10}})));
+  PNlib.Components.TC T3(nIn=2, arcWeightIn={1, 2}) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}}, rotation=0, origin={80, 0})));
 equation
   connect(T1.outPlaces[1], P2. inTransition[1]) annotation(Line(points={{-5.2, 0}, {9.2, 0}}, color={0, 0, 0}));
   connect(P1.outTransition[1], TA1. inPlace) annotation(Line(points={{-49.2, -0.5}, {-48, -0.5}, {-48, 0}, {-45.1111, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TAwithPCtoTC.mo b/PNlib/Examples/ExtTest/TAwithPCtoTC.mo
index 74d50472..47d69af7 100644
--- a/PNlib/Examples/ExtTest/TAwithPCtoTC.mo
+++ b/PNlib/Examples/ExtTest/TAwithPCtoTC.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model TAwithPCtoTC
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
-  PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
-  TA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
-  TC T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.PC P1(nOut=2, startMarks=5) annotation(Placement(transformation(extent={{-54, -10}, {-34, 10}})));
+  PNlib.Components.PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PC P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
+  PNlib.Components.TA TA1(testValue=3) annotation(Placement(transformation(extent={{-20, -34}, {-6, -28}})));
+  PNlib.Components.TC T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TC T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-33.2, -0.5}, {-28, -0.5}, {-28, 30}, {11.2, 30}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TAwithPDtoTD.mo b/PNlib/Examples/ExtTest/TAwithPDtoTD.mo
index 68987a63..e71d0715 100644
--- a/PNlib/Examples/ExtTest/TAwithPDtoTD.mo
+++ b/PNlib/Examples/ExtTest/TAwithPDtoTD.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model TAwithPDtoTD
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-52, -10}, {-32, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
-  TA TA1(testValue=3) annotation(Placement(transformation(extent={{-18, -36}, {-4, -30}})));
-  TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-52, -10}, {-32, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
+  PNlib.Components.TA TA1(testValue=3) annotation(Placement(transformation(extent={{-18, -36}, {-4, -30}})));
+  PNlib.Components.TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-31.2, -0.5}, {-26, -0.5}, {-26, 30}, {11.2, 30}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TAwithPDtoTD2.mo b/PNlib/Examples/ExtTest/TAwithPDtoTD2.mo
index 06bcd158..d482c658 100644
--- a/PNlib/Examples/ExtTest/TAwithPDtoTD2.mo
+++ b/PNlib/Examples/ExtTest/TAwithPDtoTD2.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model TAwithPDtoTD2
   extends Modelica.Icons.Example;
-  inner Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-52, -10}, {-32, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
-  PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
-  TA TA1(realTestArc = false, testValue = 3) annotation(Placement(transformation(extent={{-18, -36}, {-4, -30}})));
-  TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
-  TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.PD P1(nOut=2, startTokens=5) annotation(Placement(transformation(extent={{-52, -10}, {-32, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{30, 20}, {50, 40}})));
+  PNlib.Components.PD P3(nIn=1) annotation(Placement(transformation(extent={{30, -40}, {50, -20}})));
+  PNlib.Components.TA TA1(realTestArc = false, testValue = 3) annotation(Placement(transformation(extent={{-18, -36}, {-4, -30}})));
+  PNlib.Components.TD T1(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, 20}, {26, 40}})));
+  PNlib.Components.TD T2(nIn=1, nOut=1) annotation(Placement(transformation(extent={{6, -40}, {26, -20}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-31.2, -0.5}, {-26, -0.5}, {-26, 30}, {11.2, 30}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{20.8, 30}, {20.8, 30}, {29.2, 30}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TAwithWeaklyActivation.mo b/PNlib/Examples/ExtTest/TAwithWeaklyActivation.mo
index d7883418..e2aaad7f 100644
--- a/PNlib/Examples/ExtTest/TAwithWeaklyActivation.mo
+++ b/PNlib/Examples/ExtTest/TAwithWeaklyActivation.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model TAwithWeaklyActivation
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-80, 60}, {-60, 80}})));
-  PNlib.PC P1(nIn=1, nOut=2, startMarks=4) annotation(Placement(transformation(extent={{-40, 30}, {-20, 50}})));
-  PNlib.PC P2(nIn=1, maxMarks=3) annotation(Placement(transformation(extent={{50, 10}, {70, 30}})));
-  PNlib.TA TA1(normalArc=false, testValue=5) annotation(Placement(transformation(extent={{-7, -2}, {7, 2}}, rotation=0, origin={9, 20})));
-  PNlib.TC T1(nOut=1, maximumSpeed=if time > 2 then 2 else 1) annotation(Placement(transformation(extent={{-70, 30}, {-50, 50}})));
-  PNlib.TC T2(nOut=1, nIn=1) annotation(Placement(transformation(extent={{20, 10}, {40, 30}})));
-  PNlib.TC T3(nIn=1, maximumSpeed=if time > 3 then 2 else 0) annotation(Placement(transformation(extent={{20, 50}, {40, 70}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-80, 60}, {-60, 80}})));
+  PNlib.Components.PC P1(nIn=1, nOut=2, startMarks=4) annotation(Placement(transformation(extent={{-40, 30}, {-20, 50}})));
+  PNlib.Components.PC P2(nIn=1, maxMarks=3) annotation(Placement(transformation(extent={{50, 10}, {70, 30}})));
+  PNlib.Components.TA TA1(normalArc=false, testValue=5) annotation(Placement(transformation(extent={{-7, -2}, {7, 2}}, rotation=0, origin={9, 20})));
+  PNlib.Components.TC T1(nOut=1, maximumSpeed=if time > 2 then 2 else 1) annotation(Placement(transformation(extent={{-70, 30}, {-50, 50}})));
+  PNlib.Components.TC T2(nOut=1, nIn=1) annotation(Placement(transformation(extent={{20, 10}, {40, 30}})));
+  PNlib.Components.TC T3(nIn=1, maximumSpeed=if time > 3 then 2 else 0) annotation(Placement(transformation(extent={{20, 50}, {40, 70}})));
 equation
   connect(P1.outTransition[1], TA1.inPlace) annotation(Line(points={{-19.2, 39.5}, {-10, 39.5}, {-10, 20}, {0.888889, 20}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points={{-55.2, 40}, {-40.8, 40}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TDSTest.mo b/PNlib/Examples/ExtTest/TDSTest.mo
index 2750e162..c3d6659b 100644
--- a/PNlib/Examples/ExtTest/TDSTest.mo
+++ b/PNlib/Examples/ExtTest/TDSTest.mo
@@ -1,10 +1,10 @@
 within PNlib.Examples.ExtTest;
 model TDSTest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
-  TDS T1(localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
+  PNlib.Components.TDS T1(localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-19.2, 0}, {-4.8, 0}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 0}, {19.2, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TDSTestinterrupt.mo b/PNlib/Examples/ExtTest/TDSTestinterrupt.mo
index e1968d3f..b6a13daa 100644
--- a/PNlib/Examples/ExtTest/TDSTestinterrupt.mo
+++ b/PNlib/Examples/ExtTest/TDSTestinterrupt.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.ExtTest;
 model TDSTestinterrupt
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PNlib.PD P1(nIn = 1, nOut = 2, startTokens= 1) annotation(Placement(visible = true, transformation(extent = {{-48, -20}, {-28, 0}}, rotation = 0)));
-  PNlib.PD P2(nIn=1) annotation(Placement(visible = true, transformation(extent = {{12, -20}, {32, 0}}, rotation = 0)));
-  PNlib.TDS T1(a = 0.5, b = 1.5, c = 1,distributionType=PNlib.Types.DistributionType.Triangular, localSeed=1, nIn=1, nOut=1) annotation(Placement(visible = true, transformation(extent = {{-18, -20}, {2, 0}}, rotation = 0)));
-  PNlib.TE T2(event = {0.4}, nIn = 1)  annotation(
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nIn = 1, nOut = 2, startTokens= 1) annotation(Placement(visible = true, transformation(extent = {{-48, -20}, {-28, 0}}, rotation = 0)));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(visible = true, transformation(extent = {{12, -20}, {32, 0}}, rotation = 0)));
+  PNlib.Components.TDS T1(a = 0.5, b = 1.5, c = 1,distributionType=PNlib.Types.DistributionType.Triangular, localSeed=1, nIn=1, nOut=1) annotation(Placement(visible = true, transformation(extent = {{-18, -20}, {2, 0}}, rotation = 0)));
+  PNlib.Components.TE T2(event = {0.4}, nIn = 1)  annotation(
     Placement(visible = true, transformation(origin = {-8, 20}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T3(event = {2, 4}, nOut = 1)  annotation(
+  PNlib.Components.TE T3(event = {2, 4}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-66, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(
diff --git a/PNlib/Examples/ExtTest/TDSdiscrete.mo b/PNlib/Examples/ExtTest/TDSdiscrete.mo
index 3a8538af..93f30e54 100644
--- a/PNlib/Examples/ExtTest/TDSdiscrete.mo
+++ b/PNlib/Examples/ExtTest/TDSdiscrete.mo
@@ -1,10 +1,10 @@
 within PNlib.Examples.ExtTest;
 model TDSdiscrete
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PD P1(nOut=1, startTokens=18) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
-  TDS T1(distributionType=PNlib.Types.DistributionType.Discrete, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nOut=1, startTokens=18) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
+  PNlib.Components.TDS T1(distributionType=PNlib.Types.DistributionType.Discrete, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-19.2, 0}, {-4.8, 0}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 0}, {19.2, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TDStriangular.mo b/PNlib/Examples/ExtTest/TDStriangular.mo
index 68ff82a0..9b8b8752 100644
--- a/PNlib/Examples/ExtTest/TDStriangular.mo
+++ b/PNlib/Examples/ExtTest/TDStriangular.mo
@@ -1,10 +1,10 @@
 within PNlib.Examples.ExtTest;
 model TDStriangular
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
-  TDS T1(distributionType=PNlib.Types.DistributionType.Triangular, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
+  PNlib.Components.TDS T1(distributionType=PNlib.Types.DistributionType.Triangular, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-19.2, 0}, {-4.8, 0}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 0}, {19.2, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TDStruncatednormal.mo b/PNlib/Examples/ExtTest/TDStruncatednormal.mo
index 8a3cd6e5..6ace53ed 100644
--- a/PNlib/Examples/ExtTest/TDStruncatednormal.mo
+++ b/PNlib/Examples/ExtTest/TDStruncatednormal.mo
@@ -1,10 +1,10 @@
 within PNlib.Examples.ExtTest;
 model TDStruncatednormal
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
-  TDS T1(distributionType = PNlib.Types.DistributionType.TruncatedNormal,localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
+  PNlib.Components.TDS T1(distributionType = PNlib.Types.DistributionType.TruncatedNormal,localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-19.2, 0}, {-4.8, 0}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 0}, {19.2, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TDSuniform.mo b/PNlib/Examples/ExtTest/TDSuniform.mo
index e3ec2a7a..f0d78c3f 100644
--- a/PNlib/Examples/ExtTest/TDSuniform.mo
+++ b/PNlib/Examples/ExtTest/TDSuniform.mo
@@ -1,10 +1,10 @@
 within PNlib.Examples.ExtTest;
 model TDSuniform
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
-  PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
-  TDS T1(a = 2, b = 4,distributionType=PNlib.Types.DistributionType.Uniform, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nOut=1, startTokens=8) annotation(Placement(transformation(extent={{-40, -10}, {-20, 10}})));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(transformation(extent={{20, -10}, {40, 10}})));
+  PNlib.Components.TDS T1(a = 2, b = 4,distributionType=PNlib.Types.DistributionType.Uniform, localSeed=1, nIn=1, nOut=1) annotation(Placement(transformation(extent={{-10, -10}, {10, 10}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-19.2, 0}, {-4.8, 0}}, color={0, 0, 0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 0}, {19.2, 0}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/ExtTest/TESTest.mo b/PNlib/Examples/ExtTest/TESTest.mo
index a06397e3..ffca908f 100644
--- a/PNlib/Examples/ExtTest/TESTest.mo
+++ b/PNlib/Examples/ExtTest/TESTest.mo
@@ -1,12 +1,12 @@
 within PNlib.Examples.ExtTest;
 model TESTest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
-  PNlib.PD P1(nIn = 1, nOut = 1, startTokens= 1) annotation(Placement(visible = true, transformation(extent = {{-48, -20}, {-28, 0}}, rotation = 0)));
-  PNlib.PD P2(nIn=1) annotation(Placement(visible = true, transformation(extent = {{12, -20}, {32, 0}}, rotation = 0)));
-  PNlib.TE T2(event = {3, 4, 5, 9}, nOut = 1)  annotation(
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{20, 20}, {40, 40}})));
+  PNlib.Components.PD P1(nIn = 1, nOut = 1, startTokens= 1) annotation(Placement(visible = true, transformation(extent = {{-48, -20}, {-28, 0}}, rotation = 0)));
+  PNlib.Components.PD P2(nIn=1) annotation(Placement(visible = true, transformation(extent = {{12, -20}, {32, 0}}, rotation = 0)));
+  PNlib.Components.TE T2(event = {3, 4, 5, 9}, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-66, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  TES T1(distributionType = PNlib.Types.DistributionType.Triangular, nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TES T1(distributionType = PNlib.Types.DistributionType.Triangular, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {-8, -10}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(
diff --git a/PNlib/Examples/ExtTest/TFDStest.mo b/PNlib/Examples/ExtTest/TFDStest.mo
index 82e0e999..9505a080 100644
--- a/PNlib/Examples/ExtTest/TFDStest.mo
+++ b/PNlib/Examples/ExtTest/TFDStest.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.ExtTest;
 
 model TFDStest
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(extent = {{20, 20}, {40, 40}}, rotation = 0)));
-  PNlib.PD P1(nIn = 0, nOut = 1, startTokens = 5) annotation(
+  PNlib.Components.PD P1(nIn = 0, nOut = 1, startTokens = 5) annotation(
     Placement(visible = true, transformation(extent = {{-38, -10}, {-18, 10}}, rotation = 0)));
-  PNlib.PD P2(nIn = 1) annotation(
+  PNlib.Components.PD P2(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {28, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TFDS T1(b = 2, c = 1,distributionType = PNlib.Types.DistributionType.Triangular, localSeed = 5, nIn = 1, nOut = 1)  annotation(
+  PNlib.Components.TFDS T1(b = 2, c = 1,distributionType = PNlib.Types.DistributionType.Triangular, localSeed = 5, nIn = 1, nOut = 1)  annotation(
     Placement(visible = true, transformation(origin = {0, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(
diff --git a/PNlib/Examples/HybTest/ConflictPrio.mo b/PNlib/Examples/HybTest/ConflictPrio.mo
index 9159f5ac..3b0856fe 100644
--- a/PNlib/Examples/HybTest/ConflictPrio.mo
+++ b/PNlib/Examples/HybTest/ConflictPrio.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.HybTest;
 model ConflictPrio
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/ConflictProb.mo b/PNlib/Examples/HybTest/ConflictProb.mo
index 8bd03e45..d7aebbec 100644
--- a/PNlib/Examples/HybTest/ConflictProb.mo
+++ b/PNlib/Examples/HybTest/ConflictProb.mo
@@ -2,19 +2,19 @@ within PNlib.Examples.HybTest;
 
 model ConflictProb
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, startMarks=2,
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, startMarks=2,
     localSeedIn=1,
     localSeedOut=2)                                                                            annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1,
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1,
     localSeedIn=3,
     localSeedOut=4)    annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1,
+  PNlib.Components.PD P3(nIn = 1,
     localSeedIn=5,
     localSeedOut=6)    annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/ConflictType3.mo b/PNlib/Examples/HybTest/ConflictType3.mo
index 32d66964..5f2c6c80 100644
--- a/PNlib/Examples/HybTest/ConflictType3.mo
+++ b/PNlib/Examples/HybTest/ConflictType3.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.HybTest;
 
 model ConflictType3
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TC T1(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TC T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TC T1(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TC T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/ConflictType4.mo b/PNlib/Examples/HybTest/ConflictType4.mo
index 09cb6b3a..f099a0c7 100644
--- a/PNlib/Examples/HybTest/ConflictType4.mo
+++ b/PNlib/Examples/HybTest/ConflictType4.mo
@@ -2,14 +2,14 @@ within PNlib.Examples.HybTest;
 
 model ConflictType4
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
-  PNlib.PC P1(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50, 10}, {-30, 30}})));
-  PNlib.PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
-  PNlib.PC P3(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50, -50}, {-30, -30}})));
-  PNlib.PC P4(nIn=1) annotation(Placement(transformation(extent={{30, -50}, {50, -30}})));
-  PNlib.TC T1(nIn=2, nOut=2) annotation(Placement(transformation(extent={{-10, -50}, {10, -30}})));
-  PNlib.TC T2(nIn=2, nOut=2) annotation(Placement(transformation(extent={{-10, 10}, {10, 30}})));
-  PNlib.PD P5(nOut=2, nIn=2, startTokens=1) annotation(Placement(transformation(extent={{10, -20}, {-10, 0}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 40}, {-40, 60}})));
+  PNlib.Components.PC P1(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50, 10}, {-30, 30}})));
+  PNlib.Components.PC P2(nIn=1) annotation(Placement(transformation(extent={{30, 10}, {50, 30}})));
+  PNlib.Components.PC P3(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50, -50}, {-30, -30}})));
+  PNlib.Components.PC P4(nIn=1) annotation(Placement(transformation(extent={{30, -50}, {50, -30}})));
+  PNlib.Components.TC T1(nIn=2, nOut=2) annotation(Placement(transformation(extent={{-10, -50}, {10, -30}})));
+  PNlib.Components.TC T2(nIn=2, nOut=2) annotation(Placement(transformation(extent={{-10, 10}, {10, 30}})));
+  PNlib.Components.PD P5(nOut=2, nIn=2, startTokens=1) annotation(Placement(transformation(extent={{10, -20}, {-10, 0}})));
 equation
   connect(P1.outTransition[1], T2.inPlaces[1]) annotation(Line(points={{-29.2, 20}, {-28, 20}, {-28, 20}, {-16, 20}, {-16, 19.5}, {-4.8, 19.5}}, color={0, 0, 0}));
   connect(T2.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8, 19.5}, {12, 19.5}, {12, 20}, {29.2, 20}}, color={0, 0, 0}));
diff --git a/PNlib/Examples/HybTest/EightConflictProb.mo b/PNlib/Examples/HybTest/EightConflictProb.mo
index 387e3c45..b7e0395d 100644
--- a/PNlib/Examples/HybTest/EightConflictProb.mo
+++ b/PNlib/Examples/HybTest/EightConflictProb.mo
@@ -1,18 +1,18 @@
 within PNlib.Examples.HybTest;
 model EightConflictProb
   extends Modelica.Icons.Example;
-  PNlib.PC P1(enablingType = PNlib.Types.EnablingType.Probability, nOut = 8, startMarks=1,
+  PNlib.Components.PC P1(enablingType = PNlib.Types.EnablingType.Probability, nOut = 8, startMarks=1,
     localSeedIn=1,
     localSeedOut=2)                                     annotation(Placement(transformation(extent = {{-50, -10}, {-30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{-20, 30}, {0, 50}})));
-  PNlib.TD T2(nIn = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T3(nIn = 1) annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
-  PNlib.TD T4(nIn = 1) annotation(Placement(transformation(extent = {{40, 10}, {60, 30}})));
-  PNlib.TD T5(nIn = 1) annotation(Placement(transformation(extent = {{40, -30}, {60, -10}})));
-  PNlib.TD T6(nIn = 1) annotation(Placement(transformation(extent = {{-20, -50}, {0, -30}})));
-  PNlib.TD T7(nIn = 1) annotation(Placement(transformation(extent = {{20, -40}, {40, -20}})));
-  PNlib.TD T8(nIn = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}})));
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{-20, 30}, {0, 50}})));
+  PNlib.Components.TD T2(nIn = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T3(nIn = 1) annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
+  PNlib.Components.TD T4(nIn = 1) annotation(Placement(transformation(extent = {{40, 10}, {60, 30}})));
+  PNlib.Components.TD T5(nIn = 1) annotation(Placement(transformation(extent = {{40, -30}, {60, -10}})));
+  PNlib.Components.TD T6(nIn = 1) annotation(Placement(transformation(extent = {{-20, -50}, {0, -30}})));
+  PNlib.Components.TD T7(nIn = 1) annotation(Placement(transformation(extent = {{20, -40}, {40, -20}})));
+  PNlib.Components.TD T8(nIn = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-29.2, -0.875}, {-20, -0.875}, {-20, 40}, {-14.8, 40}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(T2.inPlaces[1], P1.outTransition[2]) annotation(Line(points = {{5.2, 20}, {0, 20}, {0, -0.625}, {-29.2, -0.625}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/HybLoopAndArcweight.mo b/PNlib/Examples/HybTest/HybLoopAndArcweight.mo
index 2031a87d..32d05c46 100644
--- a/PNlib/Examples/HybTest/HybLoopAndArcweight.mo
+++ b/PNlib/Examples/HybTest/HybLoopAndArcweight.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.HybTest;
 
 model HybLoopAndArcweight
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nOut = 1, nIn = 1, startMarks=2) annotation(Placement(transformation(extent = {{-10, -30}, {10, -10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1, arcWeightIn={1.5}, arcWeightOut={2.5}) annotation(Placement(transformation(extent = {{8, 10}, {-12, 30}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{20, 40}, {40, 60}})));
+  PNlib.Components.PC P1(nOut = 1, nIn = 1, startMarks=2) annotation(Placement(transformation(extent = {{-10, -30}, {10, -10}})));
+  PNlib.Components.TD T1(nIn = 1, nOut = 1, arcWeightIn={1.5}, arcWeightOut={2.5}) annotation(Placement(transformation(extent = {{8, 10}, {-12, 30}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{20, 40}, {40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{10.8, -20}, {20, -20}, {20, 20}, {2.8, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(T1.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-6.8, 20}, {-20, 20}, {-20, -20}, {-10.8, -20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/InputConflictPrio.mo b/PNlib/Examples/HybTest/InputConflictPrio.mo
index 65a75582..81821355 100644
--- a/PNlib/Examples/HybTest/InputConflictPrio.mo
+++ b/PNlib/Examples/HybTest/InputConflictPrio.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.HybTest;
 
 model InputConflictPrio
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 2, nOut = 1, maxMarks=2) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
-  PNlib.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, 10}, {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, -30}, {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
+  PNlib.Components.PC P1(nIn = 2, nOut = 1, maxMarks=2) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
+  PNlib.Components.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, 10}, {-30, 30}})));
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, -30}, {-30, -10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{-29.2, 20}, {-14.8, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P3.outTransition[1], T3.inPlaces[1]) annotation(Line(points = {{-29.2, -20}, {-14.8, -20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/InputConflictProb.mo b/PNlib/Examples/HybTest/InputConflictProb.mo
index 7105365b..945508af 100644
--- a/PNlib/Examples/HybTest/InputConflictProb.mo
+++ b/PNlib/Examples/HybTest/InputConflictProb.mo
@@ -1,19 +1,19 @@
 within PNlib.Examples.HybTest;
 model InputConflictProb
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 2, nOut = 1, enablingType = PNlib.Types.EnablingType.Probability, maxMarks=2,
+  PNlib.Components.PC P1(nIn = 2, nOut = 1, enablingType = PNlib.Types.EnablingType.Probability, maxMarks=2,
     localSeedIn=1,
     localSeedOut=2)                                            annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
-  PNlib.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1,
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
+  PNlib.Components.TD T3(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1,
     localSeedIn=3,
     localSeedOut=4)                      annotation(Placement(transformation(extent = {{-50, 10}, {-30, 30}})));
-  PNlib.PD P3(startTokens = 5, nOut = 1,
+  PNlib.Components.PD P3(startTokens = 5, nOut = 1,
     localSeedIn=5,
     localSeedOut=6)                                        annotation(Placement(transformation(extent = {{-50, -30}, {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{-29.2, 20}, {-14.8, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P3.outTransition[1], T3.inPlaces[1]) annotation(Line(points = {{-29.2, -20}, {-14.8, -20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/InputConflictType3.mo b/PNlib/Examples/HybTest/InputConflictType3.mo
index 597f158f..b15af6d5 100644
--- a/PNlib/Examples/HybTest/InputConflictType3.mo
+++ b/PNlib/Examples/HybTest/InputConflictType3.mo
@@ -1,13 +1,13 @@
 within PNlib.Examples.HybTest;
 model InputConflictType3
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 2, nOut = 1, maxMarks=2) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
-  PNlib.TC T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
-  PNlib.TC T3(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
-  PNlib.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, 10}, {-30, 30}})));
-  PNlib.PC P3(nOut = 1, startMarks=5) annotation(Placement(transformation(extent = {{-50, -30}, {-30, -10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
+  PNlib.Components.PC P1(nIn = 2, nOut = 1, maxMarks=2) annotation(Placement(transformation(extent={{10, -10}, {30, 10}})));
+  PNlib.Components.TC T1(nIn = 1) annotation(Placement(transformation(extent = {{40, -10}, {60, 10}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{-20, 10}, {0, 30}})));
+  PNlib.Components.TC T3(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{-20, -30}, {0, -10}})));
+  PNlib.Components.PD P2(startTokens = 5, nOut = 1) annotation(Placement(transformation(extent = {{-50, 10}, {-30, 30}})));
+  PNlib.Components.PC P3(nOut = 1, startMarks=5) annotation(Placement(transformation(extent = {{-50, -30}, {-30, -10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{40, 20}, {60, 40}})));
 equation
   connect(P2.outTransition[1], T2.inPlaces[1]) annotation(Line(points = {{-29.2, 20}, {-14.8, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P3.outTransition[1], T3.inPlaces[1]) annotation(Line(points = {{-29.2, -20}, {-14.8, -20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/OutputConflictPrio.mo b/PNlib/Examples/HybTest/OutputConflictPrio.mo
index 2ae7d07c..9497bf7d 100644
--- a/PNlib/Examples/HybTest/OutputConflictPrio.mo
+++ b/PNlib/Examples/HybTest/OutputConflictPrio.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.HybTest;
 
 model OutputConflictPrio
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, minMarks=2, startMarks=4) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, minMarks=2, startMarks=4) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/OutputConflictProb.mo b/PNlib/Examples/HybTest/OutputConflictProb.mo
index 87dccbd6..14fe3a86 100644
--- a/PNlib/Examples/HybTest/OutputConflictProb.mo
+++ b/PNlib/Examples/HybTest/OutputConflictProb.mo
@@ -1,19 +1,19 @@
 within PNlib.Examples.HybTest;
 model OutputConflictProb
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, minMarks=2, startMarks=4,
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, enablingType = PNlib.Types.EnablingType.Probability, minMarks=2, startMarks=4,
     localSeedIn=1,
     localSeedOut=2)                                                                                        annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PD P2(nIn = 1,
+  PNlib.Components.TD T1(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PD P2(nIn = 1,
     localSeedIn=3,
     localSeedOut=4)    annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1,
+  PNlib.Components.PD P3(nIn = 1,
     localSeedIn=5,
     localSeedOut=6)    annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.TD T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/OutputConflictType3.mo b/PNlib/Examples/HybTest/OutputConflictType3.mo
index 965918dd..0509734b 100644
--- a/PNlib/Examples/HybTest/OutputConflictType3.mo
+++ b/PNlib/Examples/HybTest/OutputConflictType3.mo
@@ -2,13 +2,13 @@ within PNlib.Examples.HybTest;
 
 model OutputConflictType3
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TC T1(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
-  PNlib.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
-  PNlib.PC P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
-  PNlib.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
-  PNlib.TC T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
+  PNlib.Components.PC P1(nIn = 1, nOut = 2, startMarks=2) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TC T1(nIn = 1, nOut = 1, maximumSpeed=2) annotation(Placement(transformation(extent = {{0, 10}, {20, 30}})));
+  PNlib.Components.TD T2(nIn = 1, nOut = 1) annotation(Placement(transformation(extent = {{0, -30}, {20, -10}})));
+  PNlib.Components.PC P2(nIn = 1) annotation(Placement(transformation(extent = {{30, 10}, {50, 30}})));
+  PNlib.Components.PD P3(nIn = 1) annotation(Placement(transformation(extent = {{30, -30}, {50, -10}})));
+  PNlib.Components.TC T3(nOut = 1) annotation(Placement(transformation(extent = {{-60, -10}, {-40, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 20}, {-40, 40}})));
 equation
   connect(T3.outPlaces[1], P1.inTransition[1]) annotation(Line(points = {{-45.2, 0}, {-30.8, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points = {{-9.2, -0.5}, {0, -0.5}, {0, 20}, {5.2, 20}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/PCtoTD.mo b/PNlib/Examples/HybTest/PCtoTD.mo
index 43b16bd1..220c983c 100644
--- a/PNlib/Examples/HybTest/PCtoTD.mo
+++ b/PNlib/Examples/HybTest/PCtoTD.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.HybTest;
 
 model PCtoTD
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
-  PNlib.PC P1(nOut=1, startMarks=8) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn=1, delay=1, arcWeightIn={1}) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
+  PNlib.Components.PC P1(nOut=1, startMarks=8) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn=1, delay=1, arcWeightIn={1}) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
 equation
   connect(T1.inPlaces[1], P1.outTransition[1]) annotation(Line(points = {{15.2, 0}, {-9.2, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   annotation(Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-40, -40}, {40, 40}}), graphics), experiment(StartTime = 0.0, StopTime = 10.0, Tolerance = 1e-6));
diff --git a/PNlib/Examples/HybTest/PCtoTDfunction.mo b/PNlib/Examples/HybTest/PCtoTDfunction.mo
index 4af55ce0..09379d85 100644
--- a/PNlib/Examples/HybTest/PCtoTDfunction.mo
+++ b/PNlib/Examples/HybTest/PCtoTDfunction.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.HybTest;
 
 model PCtoTDfunction
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
-  PNlib.PC P1(nOut=1, startMarks=5) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
-  PNlib.TD T1(nIn=1, arcWeightIn={P1.t}) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{20, 20}, {40, 40}})));
+  PNlib.Components.PC P1(nOut=1, startMarks=5) annotation(Placement(transformation(extent = {{-30, -10}, {-10, 10}})));
+  PNlib.Components.TD T1(nIn=1, arcWeightIn={P1.t}) annotation(Placement(transformation(extent = {{10, -10}, {30, 10}})));
 equation
   connect(T1.inPlaces[1], P1.outTransition[1]) annotation(Line(points = {{15.2, 0}, {-9.2, 0}}, color = {0, 0, 0}, smooth = Smooth.None));
   annotation(Diagram(coordinateSystem(preserveAspectRatio = false, extent = {{-40, -40}, {40, 40}}), graphics), experiment(StartTime = 0.0, StopTime = 5.0, Tolerance = 1e-6));
diff --git a/PNlib/Examples/HybTest/SixConflictProb.mo b/PNlib/Examples/HybTest/SixConflictProb.mo
index a6031821..2afd1b54 100644
--- a/PNlib/Examples/HybTest/SixConflictProb.mo
+++ b/PNlib/Examples/HybTest/SixConflictProb.mo
@@ -1,16 +1,16 @@
 within PNlib.Examples.HybTest;
 model SixConflictProb
   extends Modelica.Icons.Example;
-  PNlib.PC P1(enablingType = PNlib.Types.EnablingType.Probability, nOut = 6, startMarks=1,
+  PNlib.Components.PC P1(enablingType = PNlib.Types.EnablingType.Probability, nOut = 6, startMarks=1,
     localSeedIn=1,
     localSeedOut=2)                                     annotation(Placement(transformation(extent = {{-50, -10}, {-30, 10}})));
-  PNlib.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{-20, 30}, {0, 50}})));
-  PNlib.TD T2(nIn = 1) annotation(Placement(transformation(extent = {{0, 20}, {20, 40}})));
-  PNlib.TD T3(nIn = 1) annotation(Placement(transformation(extent = {{20, 10}, {40, 30}})));
-  PNlib.TD T4(nIn = 1) annotation(Placement(transformation(extent = {{20, -30}, {40, -10}})));
-  PNlib.TD T5(nIn = 1) annotation(Placement(transformation(extent = {{0, -40}, {20, -20}})));
-  PNlib.TD T6(nIn = 1) annotation(Placement(transformation(extent = {{-20, -50}, {0, -30}})));
-  inner PNlib.Settings settings annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}})));
+  PNlib.Components.TD T1(nIn = 1) annotation(Placement(transformation(extent = {{-20, 30}, {0, 50}})));
+  PNlib.Components.TD T2(nIn = 1) annotation(Placement(transformation(extent = {{0, 20}, {20, 40}})));
+  PNlib.Components.TD T3(nIn = 1) annotation(Placement(transformation(extent = {{20, 10}, {40, 30}})));
+  PNlib.Components.TD T4(nIn = 1) annotation(Placement(transformation(extent = {{20, -30}, {40, -10}})));
+  PNlib.Components.TD T5(nIn = 1) annotation(Placement(transformation(extent = {{0, -40}, {20, -20}})));
+  PNlib.Components.TD T6(nIn = 1) annotation(Placement(transformation(extent = {{-20, -50}, {0, -30}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent = {{-60, 40}, {-40, 60}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-29.2,
           -0.833333}, {-20, -0.833333}, {-20, 40}, {-14.8, 40}}, color = {0, 0, 0}, smooth = Smooth.None));
diff --git a/PNlib/Examples/HybTest/TCwithPD.mo b/PNlib/Examples/HybTest/TCwithPD.mo
index 9fb3d3d0..a488005a 100644
--- a/PNlib/Examples/HybTest/TCwithPD.mo
+++ b/PNlib/Examples/HybTest/TCwithPD.mo
@@ -2,11 +2,11 @@ within PNlib.Examples.HybTest;
 
 model TCwithPD
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60,40},{-40,60}})));
-  PNlib.PC P1(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50,10},{-30,30}})));
-  PNlib.PC P2(nIn=1) annotation(Placement(transformation(extent={{30,10},{50,30}})));
-  PNlib.TC T1(nIn=2, nOut=2, arcWeightIn={2,1}, firingCon=true) annotation(Placement(transformation(extent={{-10,10},{10,30}})));
-  PNlib.PD P3(nOut=1, nIn=1, startTokens=10) annotation(Placement(transformation(extent={{10,-20},{-10,0}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60,40},{-40,60}})));
+  PNlib.Components.PC P1(nOut=1, startMarks=10) annotation(Placement(transformation(extent={{-50,10},{-30,30}})));
+  PNlib.Components.PC P2(nIn=1) annotation(Placement(transformation(extent={{30,10},{50,30}})));
+  PNlib.Components.TC T1(nIn=2, nOut=2, arcWeightIn={2,1}, firingCon=true) annotation(Placement(transformation(extent={{-10,10},{10,30}})));
+  PNlib.Components.PD P3(nOut=1, nIn=1, startTokens=10) annotation(Placement(transformation(extent={{10,-20},{-10,0}})));
 equation
   connect(P1.outTransition[1], T1.inPlaces[1]) annotation(Line(points={{-29.2, 20},{-28,20},{-16,20},{-16,19.5},{-4.8,19.5}}, color={0,0,0}));
   connect(T1.outPlaces[1], P2.inTransition[1]) annotation(Line(points={{4.8,19.5},{12,19.5},{12,20},{29.2,20}}, color={0,0,0}));
diff --git a/PNlib/Examples/HybTest/TDtoPC.mo b/PNlib/Examples/HybTest/TDtoPC.mo
index 667761f0..4a82acc2 100644
--- a/PNlib/Examples/HybTest/TDtoPC.mo
+++ b/PNlib/Examples/HybTest/TDtoPC.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.HybTest;
 
 model TDtoPC
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nOut = 0, nIn = 1) annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T1(nOut = 1, arcWeightOut={1}) annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin = {30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PC P1(nOut = 0, nIn = 1) annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TD T1(nOut = 1, arcWeightOut={1}) annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin = {30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.inTransition[1], T1.outPlaces[1]) annotation(Line(points = {{9.2, 0}, {9.2, 0}, {-15.2, 0}}));
   annotation(Diagram(coordinateSystem(extent = {{-40, -40}, {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0.0, StopTime = 10.0, Tolerance = 1e-6));
diff --git a/PNlib/Examples/HybTest/TDtoPCfunction.mo b/PNlib/Examples/HybTest/TDtoPCfunction.mo
index 48f6174d..c92e9a8a 100644
--- a/PNlib/Examples/HybTest/TDtoPCfunction.mo
+++ b/PNlib/Examples/HybTest/TDtoPCfunction.mo
@@ -2,9 +2,9 @@ within PNlib.Examples.HybTest;
 
 model TDtoPCfunction
   extends Modelica.Icons.Example;
-  PNlib.PC P1(nIn = 1, startMarks=5) annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TD T1(nOut = 1, arcWeightOut={P1.t}) annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(Placement(visible = true, transformation(origin = {30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.PC P1(nIn = 1, startMarks=5) annotation(Placement(visible = true, transformation(origin = {20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  PNlib.Components.TD T1(nOut = 1, arcWeightOut={P1.t}) annotation(Placement(visible = true, transformation(origin = {-20, 0}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
+  inner PNlib.Components.Settings settings annotation(Placement(visible = true, transformation(origin = {30, 30}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(P1.inTransition[1], T1.outPlaces[1]) annotation(Line(points = {{9.2, 0}, {9.2, 0}, {-15.2, 0}}));
   annotation(Diagram(coordinateSystem(extent = {{-40, -40}, {40, 40}}, preserveAspectRatio = true, initialScale = 0.1, grid = {2, 2})), experiment(StartTime = 0.0, StopTime = 5.0, Tolerance = 1e-6));
diff --git a/PNlib/Examples/Models/BicoloredPlaces/Aquarium.mo b/PNlib/Examples/Models/BicoloredPlaces/Aquarium.mo
index 1e78f118..48cff219 100644
--- a/PNlib/Examples/Models/BicoloredPlaces/Aquarium.mo
+++ b/PNlib/Examples/Models/BicoloredPlaces/Aquarium.mo
@@ -1,7 +1,7 @@
 within PNlib.Examples.Models.BicoloredPlaces;
 model Aquarium
   extends Modelica.Icons.Example;
-  inner PNlib.Settings settings annotation(Placement(transformation(extent={{-60, 20}, {-40, 40}})));
+  inner PNlib.Components.Settings settings annotation(Placement(transformation(extent={{-60, 20}, {-40, 40}})));
   PNlib.Examples.Models.BicoloredPlaces.CPC P1(nIn=1, nOut=1, startMarks={50, 0}) annotation(Placement(transformation(extent={{-30, -10}, {-10, 10}})));
   PNlib.Examples.Models.BicoloredPlaces.CPC P2(nIn=1, startMarks={0, 0}) annotation(Placement(transformation(extent={{30, -10}, {50, 10}})));
   PNlib.Examples.Models.BicoloredPlaces.CTC t1(nOut=1, arcWeightOut={{0, 1}}) annotation(Placement(transformation(extent={{-60, -10}, {-40, 10}})));
diff --git a/PNlib/Examples/Models/BicoloredPlaces/CPC.mo b/PNlib/Examples/Models/BicoloredPlaces/CPC.mo
index bf960a03..280ec6e6 100644
--- a/PNlib/Examples/Models/BicoloredPlaces/CPC.mo
+++ b/PNlib/Examples/Models/BicoloredPlaces/CPC.mo
@@ -13,9 +13,9 @@ model CPC
   PNlib.Interfaces.PlaceOut[nOut, numColors] outTransition annotation(Placement(transformation(extent={{100,-10},{120,10}}), iconTransformation(extent={{100,-10},{120,10}})));
   Boolean animateMarking=settings.animateMarking "only for place animation and display (Do not change!)";
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
-  PC place1(nIn=nIn, nOut=nOut, startMarks=startMarks[1], minMarks=minMarks[1], maxMarks=maxMarks[1]);
-  PC place2(nIn=nIn, nOut=nOut, startMarks=startMarks[2], minMarks=minMarks[2], maxMarks=maxMarks[2]);
+  outer PNlib.Components.Settings settings "global settings for animation and display";
+  PNlib.Components.PC place1(nIn=nIn, nOut=nOut, startMarks=startMarks[1], minMarks=minMarks[1], maxMarks=maxMarks[1]);
+  PNlib.Components.PC place2(nIn=nIn, nOut=nOut, startMarks=startMarks[2], minMarks=minMarks[2], maxMarks=maxMarks[2]);
 equation
   color = {place1.t, place2.t};
 
diff --git a/PNlib/Examples/Models/BicoloredPlaces/CTC.mo b/PNlib/Examples/Models/BicoloredPlaces/CTC.mo
index f562071c..1f1934e3 100644
--- a/PNlib/Examples/Models/BicoloredPlaces/CTC.mo
+++ b/PNlib/Examples/Models/BicoloredPlaces/CTC.mo
@@ -13,8 +13,8 @@ model CTC
   PNlib.Interfaces.TransitionIn[nIn, numColors] inPlaces annotation(Placement(transformation(extent={{-56,-10},{-40,10}})));
   PNlib.Interfaces.TransitionOut[nOut, numColors] outPlaces annotation(Placement(transformation(extent={{40,-10},{56,10}})));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
-  TC transition_(nIn=numColors*nIn, nOut=numColors*nOut, maximumSpeed=maximumSpeed, arcWeightIn=arcWeightIn_flat, arcWeightOut=arcWeightOut_flat);
+  outer PNlib.Components.Settings settings "global settings for animation and display";
+  PNlib.Components.TC transition_(nIn=numColors*nIn, nOut=numColors*nOut, maximumSpeed=maximumSpeed, arcWeightIn=arcWeightIn_flat, arcWeightOut=arcWeightOut_flat);
   Real arcWeightIn_flat[nIn*numColors];
   Real arcWeightOut_flat[nOut*numColors];
 equation
diff --git a/PNlib/Examples/Models/FiliP/KrankUrlaub.mo b/PNlib/Examples/Models/FiliP/KrankUrlaub.mo
index 0df5cf74..c550d693 100644
--- a/PNlib/Examples/Models/FiliP/KrankUrlaub.mo
+++ b/PNlib/Examples/Models/FiliP/KrankUrlaub.mo
@@ -2,15 +2,15 @@ within PNlib.Examples.Models.FiliP;
 model KrankUrlaub
   parameter Real UrlaubStartTermine[:] = {10,20,30} "Begin Urlaub";
   parameter Real UrlaubEndTermine[:] = {15,25,35} "Ende Urlaub";
-    PNlib.TD Gesund1(nIn = 1, delay = 0, nOut = 1) annotation(
+    PNlib.Components.TD Gesund1(nIn = 1, delay = 0, nOut = 1) annotation(
       Placement(visible = true, transformation(extent = {{14, -90}, {-6, -70}}, rotation = 0)));
     PNlib.Examples.Models.FiliP.PNerweiterungen.PDwkeit Krankpruefer1(enablingProbOut = {WK, 1 - WK}, enablingType = PNlib.Types.EnablingType.Probability, nIn = 1, nOut = 2) annotation(
       Placement(visible = true, transformation(extent = {{40, -90}, {20, -70}}, rotation = 0)));
-    PNlib.TD Arbeitet1(nIn = 1, nOut = 1, delay = 0) annotation(
+    PNlib.Components.TD Arbeitet1(nIn = 1, nOut = 1, delay = 0) annotation(
       Placement(visible = true, transformation(extent = {{66, -90}, {46, -70}}, rotation = 0)));
-    PNlib.TD T12(nIn = 1, nOut = 1, delay = 0) annotation(
+    PNlib.Components.TD T12(nIn = 1, nOut = 1, delay = 0) annotation(
       Placement(visible = true, transformation(extent = {{-54, -90}, {-74, -70}}, rotation = 0)));
-    PNlib.PD KannArbeiteten(nIn = 3, nOut = 1) annotation(
+    PNlib.Components.PD KannArbeiteten(nIn = 3, nOut = 1) annotation(
       Placement(visible = true, transformation(extent = {{-30, -90}, {-50, -70}}, rotation = 0)));
     PNlib.Interfaces.TransitionOut transitionOut annotation(
       Placement(visible = true, transformation(origin = {-116.06, 0.392857}, extent = {{16.7164, -20}, {-16.7164, 20}}, rotation = 0), iconTransformation(origin = {-117.955, -2.23214}, extent = {{18.6119, -22.2679}, {-18.6119, 22.2679}}, rotation = 0)));
@@ -18,24 +18,24 @@ model KrankUrlaub
       Placement(visible = true, transformation(origin = {116.236, -0.234045}, extent = {{16.8909, -19.766}, {-16.8909, 19.766}}, rotation = 0), iconTransformation(origin = {120.636, 0.191491}, extent = {{18.6364, -21.8085}, {-18.6364, 21.8085}}, rotation = 0)));
     Real WK;
     //Real WU;
-    PNlib.TFDS Krank(E =1:31, P = {75 / 237, 41 / 237, 24 / 237, 19 / 237, 22 / 237, 10 / 237, 13 / 237, 4 / 237, 2 / 237, 3 / 237, 2 / 237, 1 / 237, 3 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237}, distributionType = PNlib.Types.DistributionType.Discrete, nIn = 1, nOut = 1) annotation(
+    PNlib.Components.TFDS Krank(E =1:31, P = {75 / 237, 41 / 237, 24 / 237, 19 / 237, 22 / 237, 10 / 237, 13 / 237, 4 / 237, 2 / 237, 3 / 237, 2 / 237, 1 / 237, 3 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237, 1 / 237}, distributionType = PNlib.Types.DistributionType.Discrete, nIn = 1, nOut = 1) annotation(
       Placement(visible = true, transformation(origin = {4, -40}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-    PNlib.TE TUrlaubEnde(event = UrlaubEndTermine,nIn = 1, nOut = 1) annotation(
+    PNlib.Components.TE TUrlaubEnde(event = UrlaubEndTermine,nIn = 1, nOut = 1) annotation(
       Placement(visible = true, transformation(origin = {4, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-    PNlib.TE TUrlaubStart(event = UrlaubStartTermine, nOut = 1) annotation(
+    PNlib.Components.TE TUrlaubStart(event = UrlaubStartTermine, nOut = 1) annotation(
       Placement(visible = true, transformation(origin = {4, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-    PNlib.PD ImUrlaub(nIn = 1, nOut = 1) annotation(
+    PNlib.Components.PD ImUrlaub(nIn = 1, nOut = 1) annotation(
       Placement(visible = true, transformation(origin = {30, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-  PNlib.TD Urlaubgeber(delay = 0, nIn = 2, nOut = 1)  annotation(
+  PNlib.Components.TD Urlaubgeber(delay = 0, nIn = 2, nOut = 1)  annotation(
       Placement(visible = true, transformation(origin = {56, 0}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
-  PNlib.PD P1(nIn = 1, nOut = 2)  annotation(
+  PNlib.Components.PD P1(nIn = 1, nOut = 2)  annotation(
       Placement(visible = true, transformation(origin = {50, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.TE T1(event = UrlaubEndTermine, nIn = 1) annotation(
+  PNlib.Components.TE T1(event = UrlaubEndTermine, nIn = 1) annotation(
       Placement(visible = true, transformation(origin = {84, 50}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD Urlaubpruefer(nIn = 3, nOut = 2)  annotation(
+  PNlib.Components.PD Urlaubpruefer(nIn = 3, nOut = 2)  annotation(
       Placement(visible = true, transformation(origin = {80, -80}, extent = {{10, -10}, {-10, 10}}, rotation = 0)));
   protected
-    outer PNlib.Settings settings "global settings for animation and display";
+    outer PNlib.Components.Settings settings "global settings for animation and display";
   equation
     connect(Urlaubpruefer.outTransition[2], Arbeitet1.inPlaces[1]) annotation(
       Line(points = {{70, -80}, {60, -80}, {60, -80}, {60, -80}}, thickness = 0.5));
diff --git a/PNlib/Examples/Models/FiliP/ModellStationen/Station1.mo b/PNlib/Examples/Models/FiliP/ModellStationen/Station1.mo
index 49c16de7..a1406b9c 100644
--- a/PNlib/Examples/Models/FiliP/ModellStationen/Station1.mo
+++ b/PNlib/Examples/Models/FiliP/ModellStationen/Station1.mo
@@ -7,7 +7,7 @@ model Station1
     Placement(visible = true, transformation(extent = {{-20, 20}, {20, 60}}, rotation = 0)));
   PNlib.Examples.Models.FiliP.Pflegekraft pflegekraft(Dienstbereit(maxTokens = 1), WEF = 1) annotation(
     Placement(visible = true, transformation(extent = {{-60, -80}, {0, -20}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(origin = {90, 90}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(station.placeOut[1], pflegekraft.transitionIn[1]);
diff --git a/PNlib/Examples/Models/FiliP/ModellStationen/Station20.mo b/PNlib/Examples/Models/FiliP/ModellStationen/Station20.mo
index 18f31a78..b3ce2828 100644
--- a/PNlib/Examples/Models/FiliP/ModellStationen/Station20.mo
+++ b/PNlib/Examples/Models/FiliP/ModellStationen/Station20.mo
@@ -4,7 +4,7 @@ model Station20
   extends PNlib.Examples.Models.FiliP.AllgemeineParameter;
     PNlib.Examples.Models.FiliP.Station station(nP = 20, APFD = 4, APSD = 3, APND = 1) annotation(
       Placement(visible = true, transformation(extent = {{-48, 268}, {-8, 308}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(origin = {306, 290}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 
     PNlib.Examples.Models.FiliP.Pflegekraft pflegekraft1(Stelle = 0.75) annotation(
diff --git a/PNlib/Examples/Models/FiliP/ModellStationen/Station7.mo b/PNlib/Examples/Models/FiliP/ModellStationen/Station7.mo
index 8bf79c40..f8e88d28 100644
--- a/PNlib/Examples/Models/FiliP/ModellStationen/Station7.mo
+++ b/PNlib/Examples/Models/FiliP/ModellStationen/Station7.mo
@@ -18,7 +18,7 @@ model Station7
     Placement(visible = true, transformation(extent = {{-38, -242}, {22, -182}}, rotation = 0)));
   PNlib.Examples.Models.FiliP.Pflegekraft pflegekraft7(UrlaubEndTermine = {187, 215, 243}, UrlaubStartTermine = {173, 201, 229})  annotation(
     Placement(visible = true, transformation(extent = {{-38, -330}, {22, -270}}, rotation = 0)));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(origin = {140, 340}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(station.placeIn[21], pflegekraft7.transitionOut[3]);
diff --git a/PNlib/Examples/Models/FiliP/PNerweiterungen/PDwkeit.mo b/PNlib/Examples/Models/FiliP/PNerweiterungen/PDwkeit.mo
index 2e5616b6..70905fe4 100644
--- a/PNlib/Examples/Models/FiliP/PNerweiterungen/PDwkeit.mo
+++ b/PNlib/Examples/Models/FiliP/PNerweiterungen/PDwkeit.mo
@@ -44,7 +44,7 @@ model PDwkeit "Discrete Place"
   parameter Integer localSeedOut = PNlib.Functions.Random.counter() "Local seed to initialize random number generator for output conflicts" annotation(
     Dialog(enable = true, group = "Random Number Generator"));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
   Real tokenscale "only for place animation and display";
   discrete Integer pret "pre marking";
   Integer arcWeightIn[nIn] "Integer weights of input arcs";
diff --git a/PNlib/Examples/Models/FiliP/Pflegekraft.mo b/PNlib/Examples/Models/FiliP/Pflegekraft.mo
index b8185a3a..d492e3cf 100644
--- a/PNlib/Examples/Models/FiliP/Pflegekraft.mo
+++ b/PNlib/Examples/Models/FiliP/Pflegekraft.mo
@@ -20,60 +20,60 @@ model Pflegekraft
   Real GeleisteteArbeistzeitGesammt=GeleisteteArbeistzeit.t;
   protected
   extends PNlib.Examples.Models.FiliP.AllgemeineParameter;
-  PNlib.PD IstImFruehDienst(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PD IstImFruehDienst(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{-10, 240}, {10, 260}})));
-  PNlib.PD IstImSpaetDienst(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PD IstImSpaetDienst(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{-10, 150}, {10, 170}})));
-  PNlib.PD IstImNachtDienst(nIn = 1, nOut = 1) annotation(
+  PNlib.Components.PD IstImNachtDienst(nIn = 1, nOut = 1) annotation(
     Placement(transformation(extent = {{-10, 62}, {10, 82}})));
-  PNlib.TT FSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginFruehschicht/24, arcWeightIn = {1, DauerFruehschicht - 0.5}) annotation(
+  PNlib.Components.TT FSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginFruehschicht/24, arcWeightIn = {1, DauerFruehschicht - 0.5}) annotation(
     Placement(transformation(extent = {{-94, 240}, {-74, 260}})));
-  PNlib.TT SSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginSpaetschicht/24, arcWeightIn = {1, DauerSpaetschicht - 0.5}) annotation(
+  PNlib.Components.TT SSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginSpaetschicht/24, arcWeightIn = {1, DauerSpaetschicht - 0.5}) annotation(
     Placement(transformation(extent = {{-92, 150}, {-72, 170}})));
-  PNlib.TT NSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginNachtschicht/24, arcWeightIn = {1, DauerNachtschicht - 0.75}) annotation(
+  PNlib.Components.TT NSB(nOut = 2, nIn = 2, tactIntervall = 1, tactStart = BeginNachtschicht/24, arcWeightIn = {1, DauerNachtschicht - 0.75}) annotation(
     Placement(transformation(extent = {{-94, 62}, {-74, 82}})));
-  PNlib.TD FSE(nIn = 2, nOut = 2, delay = DauerFruehschicht/24, arcWeightOut = {1, DauerFruehschicht - 0.5}) annotation(
+  PNlib.Components.TD FSE(nIn = 2, nOut = 2, delay = DauerFruehschicht/24, arcWeightOut = {1, DauerFruehschicht - 0.5}) annotation(
     Placement(transformation(extent = {{74, 240}, {94, 260}})));
-  PNlib.TD SSE(nIn = 2, nOut = 2, delay = DauerSpaetschicht/24, arcWeightOut = {1, DauerSpaetschicht - 0.5}) annotation(
+  PNlib.Components.TD SSE(nIn = 2, nOut = 2, delay = DauerSpaetschicht/24, arcWeightOut = {1, DauerSpaetschicht - 0.5}) annotation(
     Placement(transformation(extent = {{74, 150}, {94, 170}})));
-  PNlib.TD NSE(nIn = 2, nOut = 2, delay = DauerNachtschicht/24, arcWeightOut = {1, DauerNachtschicht - 0.75}) annotation(
+  PNlib.Components.TD NSE(nIn = 2, nOut = 2, delay = DauerNachtschicht/24, arcWeightOut = {1, DauerNachtschicht - 0.75}) annotation(
     Placement(transformation(extent = {{74, 62}, {94, 82}})));
-  PNlib.PC GeleisteteArbeistzeit(nIn = 3) annotation(
+  PNlib.Components.PC GeleisteteArbeistzeit(nIn = 3) annotation(
     Placement(transformation(extent = {{242, -48}, {262, -28}})));
-  PNlib.PD Ruhe(nOut = 2, nIn = 3) annotation(
+  PNlib.Components.PD Ruhe(nOut = 2, nIn = 3) annotation(
     Placement(transformation(extent = {{90, -90}, {70, -70}})));
-  PNlib.PD Dienstbereit(nIn = 1, nOut = 5, startTokens = 1) annotation(
+  PNlib.Components.PD Dienstbereit(nIn = 1, nOut = 5, startTokens = 1) annotation(
     Placement(transformation(extent = {{-130, -88}, {-150, -68}})));
-  PNlib.TD RuheZeitEnde(nIn = 1, delay = 11/24, nOut = 1) annotation(
+  PNlib.Components.TD RuheZeitEnde(nIn = 1, delay = 11/24, nOut = 1) annotation(
     Placement(transformation(extent = {{62, -90}, {42, -70}})));
-  PNlib.PC ArbeitszeitKontingent( nIn = 1,nOut = 4, startMarks = if WEF == 2 then 57.75 * Stelle else 11 * Stelle) annotation(
+  PNlib.Components.PC ArbeitszeitKontingent( nIn = 1,nOut = 4, startMarks = if WEF == 2 then 57.75 * Stelle else 11 * Stelle) annotation(
     Placement(transformation(extent = {{-266, -84}, {-246, -64}})));
   PNlib.Interfaces.TransitionOut transitionOut[3] annotation(
     Placement(transformation(extent = {{-300, 154}, {-360, 252}})));
   PNlib.Interfaces.TransitionIn transitionIn[3] annotation(
     Placement(transformation(extent = {{360, 152}, {300, 250}})));
-  PNlib.TT ArbeitszeitGeber(nOut = 1, tactIntervall = 14, tactStart = if WEF == 2 then 9 else 2, arcWeightOut = {2 * 38.5 * Stelle}, nIn = 1, arcWeightIn = {ArbeitszeitKontingent.t}) annotation(
+  PNlib.Components.TT ArbeitszeitGeber(nOut = 1, tactIntervall = 14, tactStart = if WEF == 2 then 9 else 2, arcWeightOut = {2 * 38.5 * Stelle}, nIn = 1, arcWeightIn = {ArbeitszeitKontingent.t}) annotation(
     Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 90, origin = {-256, -168})));
-  PNlib.TT WochenEndSignal(nOut = 1, tactIntervall = if WEF == 3 then 7 else 14, tactStart = if WEF == 2 then 9 else 2) annotation(
+  PNlib.Components.TT WochenEndSignal(nOut = 1, tactIntervall = if WEF == 3 then 7 else 14, tactStart = if WEF == 2 then 9 else 2) annotation(
     Placement(transformation(extent = {{198, -278}, {178, -258}})));
-  PNlib.TD WochenEndGeber2(nIn = 2, nOut = 1, delay = 0) annotation(
+  PNlib.Components.TD WochenEndGeber2(nIn = 2, nOut = 1, delay = 0) annotation(
     Placement(transformation(extent = {{44, -192}, {24, -172}})));
-  PNlib.TD WochenEndGeber1(nIn = 2, nOut = 1, delay = 0) annotation(
+  PNlib.Components.TD WochenEndGeber1(nIn = 2, nOut = 1, delay = 0) annotation(
     Placement(transformation(extent = {{-130, -190}, {-110, -170}})));
-  PNlib.PD SollInsWochenEnde(nOut = 3, nIn = 1, maxTokens = 1) annotation(
+  PNlib.Components.PD SollInsWochenEnde(nOut = 3, nIn = 1, maxTokens = 1) annotation(
     Placement(transformation(extent = {{10, -10}, {-10, 10}}, rotation = -90, origin = {-8, -228})));
-  PNlib.PD ImWochenEnde(nOut = 1, nIn = 2) annotation(
+  PNlib.Components.PD ImWochenEnde(nOut = 1, nIn = 2) annotation(
     Placement(transformation(extent = {{-10, -10}, {10, 10}}, rotation = 0, origin = {-78, -158})));
-  PNlib.TT WochenEndEnde(nIn = 1, tactIntervall = if WEF == 3 then 7 else 14, tactStart = if WEF == 2 then 11 else 4, nOut = 1) annotation(
+  PNlib.Components.TT WochenEndEnde(nIn = 1, tactIntervall = if WEF == 3 then 7 else 14, tactStart = if WEF == 2 then 11 else 4, nOut = 1) annotation(
     Placement(transformation(extent = {{-34, -168}, {-14, -148}})));
-  PNlib.TD EinTagWiederholer(nOut = 1, nIn = 1, delay = 1) annotation(
+  PNlib.Components.TD EinTagWiederholer(nOut = 1, nIn = 1, delay = 1) annotation(
     Placement(transformation(extent = {{-58, -128}, {-38, -108}})));
-  PNlib.TD WEenderbeiKrank(nIn = 1, delay = 2) annotation(
+  PNlib.Components.TD WEenderbeiKrank(nIn = 1, delay = 2) annotation(
     Placement(transformation(extent = {{102, -228}, {122, -208}})));
   PNlib.Examples.Models.FiliP.KrankUrlaub krankurlaub (UrlaubEndTermine = UrlaubEndTermine, UrlaubStartTermine = UrlaubStartTermine)  annotation(
     Placement(visible = true, transformation(origin = {-80, -78}, extent = {{-20, -20}, {20, 20}}, rotation = 0)));
 protected
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
 equation
   connect(WochenEndEnde.outPlaces[1], krankurlaub.placeIn[3]) annotation(
     Line(points = {{-20, -158}, {0, -158}, {0, -80}, {-52, -80}, {-52, -78}, {-56, -78}}, thickness = 0.5));
diff --git a/PNlib/Examples/Models/FiliP/Station.mo b/PNlib/Examples/Models/FiliP/Station.mo
index a3baad70..81656997 100644
--- a/PNlib/Examples/Models/FiliP/Station.mo
+++ b/PNlib/Examples/Models/FiliP/Station.mo
@@ -17,30 +17,30 @@ model Station
   Real BesetzungsDefizitNacht = DefizizNachtSchicht.t;
   protected
   extends PNlib.Examples.Models.FiliP.AllgemeineParameter;
-  PNlib.PD DefizitFruehschicht(nIn = 1) annotation(
+  PNlib.Components.PD DefizitFruehschicht(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {164, -60}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD DefizitSpaetSchicht(nIn = 1) annotation(
+  PNlib.Components.PD DefizitSpaetSchicht(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {162, -104}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
-  PNlib.PD DefizizNachtSchicht(nIn = 1) annotation(
+  PNlib.Components.PD DefizizNachtSchicht(nIn = 1) annotation(
     Placement(visible = true, transformation(origin = {162, -146}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 
-  PNlib.PD PersonalImFruedienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APFD, nIn = nP, nOut = nP) annotation(
+  PNlib.Components.PD PersonalImFruedienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APFD, nIn = nP, nOut = nP) annotation(
     Placement(visible = true, transformation(extent = {{-10, 30}, {10, 50}}, rotation = 0)));
-  PNlib.PD PersonalImSpaetdienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APSD, nIn = nP, nOut = nP) annotation(
+  PNlib.Components.PD PersonalImSpaetdienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APSD, nIn = nP, nOut = nP) annotation(
     Placement(transformation(extent = {{-10, -10}, {10, 10}})));
-  PNlib.PD PersonalImNachtdienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APND, nIn = nP, nOut = nP) annotation(
+  PNlib.Components.PD PersonalImNachtdienst(enablingProbIn = fill(1 / nP, nP), enablingProbOut = fill(1 / nP, nP), enablingType = PNlib.Types.EnablingType.Probability, maxTokens = APND, nIn = nP, nOut = nP) annotation(
     Placement(visible = true, transformation(extent = {{-10, -50}, {10, -30}}, rotation = 0)));
   PNlib.Interfaces.PlaceOut placeOut[3 * nP] annotation(
     Placement(transformation(extent = {{200, -52}, {304, 52}})));
   PNlib.Interfaces.PlaceIn placeIn[3 * nP] annotation(
     Placement(visible = true, transformation(extent = {{-298, -50}, {-196, 48}}, rotation = 0), iconTransformation(extent = {{-298, -50}, {-196, 48}}, rotation = 0)));
-  PNlib.TT BeginnFrueh(nOut = 1, tactIntervall = 1, tactStart = (BeginFruehschicht + 1) / 24, arcWeightOut = {APFD - PersonalImFruedienst.t}) annotation(
+  PNlib.Components.TT BeginnFrueh(nOut = 1, tactIntervall = 1, tactStart = (BeginFruehschicht + 1) / 24, arcWeightOut = {APFD - PersonalImFruedienst.t}) annotation(
     Placement(visible = true, transformation(extent = {{106, -70}, {126, -50}}, rotation = 0)));
-  PNlib.TT BeginnSpaet(nOut = 1, tactIntervall = 1, tactStart = (BeginSpaetschicht + 1) / 24, arcWeightOut = {APSD - PersonalImSpaetdienst.t}) annotation(
+  PNlib.Components.TT BeginnSpaet(nOut = 1, tactIntervall = 1, tactStart = (BeginSpaetschicht + 1) / 24, arcWeightOut = {APSD - PersonalImSpaetdienst.t}) annotation(
     Placement(visible = true, transformation(extent = {{106, -114}, {126, -94}}, rotation = 0)));
-  PNlib.TT BeginnNacht(nOut = 1, tactIntervall = 1, tactStart = (BeginNachtschicht + 1) / 24, arcWeightOut = {APND - PersonalImNachtdienst.t}) annotation(
+  PNlib.Components.TT BeginnNacht(nOut = 1, tactIntervall = 1, tactStart = (BeginNachtschicht + 1) / 24, arcWeightOut = {APND - PersonalImNachtdienst.t}) annotation(
     Placement(visible = true, transformation(extent = {{106, -156}, {126, -136}}, rotation = 0)));
-  outer PNlib.Settings settings "global settings for animation and display";
+  outer PNlib.Components.Settings settings "global settings for animation and display";
 equation
   connect(BeginnNacht.outPlaces[1], DefizizNachtSchicht.inTransition[1]) annotation(
     Line(points = {{121, -146}, {149, -146}}, thickness = 0.5));
diff --git a/PNlib/Examples/Models/Printing/Role_change.mo b/PNlib/Examples/Models/Printing/Role_change.mo
index e731d2e1..9062229d 100644
--- a/PNlib/Examples/Models/Printing/Role_change.mo
+++ b/PNlib/Examples/Models/Printing/Role_change.mo
@@ -29,7 +29,7 @@ model Role_change "change of the paper role"
     firingCon=pre(start),
     arcWeightIn={1,Role.t})
             annotation(Placement(transformation(extent={{42,38},{62,58}})));
-  PNlib.PD P2(nIn=1, nOut=1,
+  PNlib.Components.PD P2(nIn=1, nOut=1,
     maxTokens=1)
     annotation(Placement(transformation(extent={{68,38},{88,58}})));
   IA       IA2(testValue=cutting_at)
@@ -37,7 +37,7 @@ model Role_change "change of the paper role"
         extent={{-8.5,-2.50012},{8.5,2.50012}},
         rotation=90,
         origin={-32.5,38.5})));
-  PNlib.PD Role_change(
+  PNlib.Components.D Role_change(
     nIn=1,
     maxTokens=1,
     nOut=2)
diff --git a/PNlib/Examples/Models/Printing/Start_Stop.mo b/PNlib/Examples/Models/Printing/Start_Stop.mo
index f952a7c0..5ee9b994 100644
--- a/PNlib/Examples/Models/Printing/Start_Stop.mo
+++ b/PNlib/Examples/Models/Printing/Start_Stop.mo
@@ -76,7 +76,7 @@ model Start_Stop "starting and stop the printing machine"
   Modelica.Blocks.Interfaces.RealOutput time_counter_ annotation(Placement(
         transformation(extent={{62,74},{82,94}}), iconTransformation(extent={{80,-20},
             {100,0}})));
-  PNlib.TD shutDown(
+  PNlib.Components.TD shutDown(
     nIn=1,
     nOut=2,
     delay=timeStopping)
@@ -84,7 +84,7 @@ model Start_Stop "starting and stop the printing machine"
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={8,0})));
-  PNlib.PD Stop2(
+  PNlib.Components.PD Stop2(
     nIn=1,
     nOut=1,
     startTokens=1,
diff --git a/PNlib/Examples/Models/Senseo/Senseo_Maschine.mo b/PNlib/Examples/Models/Senseo/Senseo_Maschine.mo
index 072633c6..9d7805a1 100644
--- a/PNlib/Examples/Models/Senseo/Senseo_Maschine.mo
+++ b/PNlib/Examples/Models/Senseo/Senseo_Maschine.mo
@@ -7,7 +7,7 @@ model Senseo_Maschine
   parameter Real TE=20 "Environment temperature [°C]";
   parameter Real TC=10 "Temperature of new water [°C]";
 
-  PNlib.TC heating(
+  PNlib.Components.TC heating(
     nIn=3,
     nOut=1,
     maximumSpeed=Psenseo/(c*water_hc.t))
@@ -15,20 +15,20 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=0,
         origin={-14,82})));
-  PNlib.TA TA1(testValue=0)
+  PNlib.Components.TA TA1(testValue=0)
                annotation(Placement(transformation(
         extent={{-5.99995,-2.00001},{6.00002,2.00001}},
         rotation=270,
         origin={-40,96})));
-  PNlib.TA TA2(testValue=0.34)
+  PNlib.Components.TA TA2(testValue=0.34)
     annotation(Placement(transformation(extent={{-86,78},{-70,84}})));
-  PNlib.PC TW(
+  PNlib.Components.PC TW(
     nIn=2,
     nOut=3,
     maxMarks=90,
     startMarks=20) "water temperature"
     annotation(Placement(transformation(extent={{10,72},{30,92}})));
-  PNlib.TC pumping(
+  PNlib.Components.TC pumping(
     maximumSpeed=0.1,
     nOut=2,
     nIn=1,
@@ -37,18 +37,18 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-144,64})));
-  PNlib.TC cooling(
+  PNlib.Components.TC cooling(
     nIn=2,
     maximumSpeed=k*(TW.t - TE),
     firingCon=TW.t > TE)
     annotation(Placement(transformation(extent={{62,72},{82,92}})));
-  PNlib.TD stopornext(
+  PNlib.Components.TD stopornext(
     nIn=2,
     firingCon=true,
     delay=1,
     nOut=1)
     annotation(Placement(transformation(extent={{158,100},{178,120}})));
-  PNlib.PC water_hc(
+  PNlib.Components.PC water_hc(
     nIn=1,
     nOut=2,
     startMarks=0.25,
@@ -57,7 +57,7 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-144,30})));
-  PNlib.TD T1(
+  PNlib.Components.TD T1(
     nIn=2,
     nOut=1,
     arcWeightIn={90,1},
@@ -65,12 +65,12 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={52,36})));
-  PNlib.TA TA3(testValue=90)
+  PNlib.Components.TA TA3(testValue=90)
                annotation(Placement(transformation(
         extent={{-6,-2},{6,2}},
         rotation=270,
         origin={46,60})));
-  PNlib.PD decision(
+  PNlib.Components.PD decision(
     nIn=1,
     maxTokens=1,
     nOut=2,
@@ -79,7 +79,7 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={32,-32})));
-  PNlib.TD T2(
+  PNlib.Components.TD T2(
     nIn=1,
     nOut=1,
     delay=1)
@@ -87,7 +87,7 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-10,-10})));
-  PNlib.TD T3(
+  PNlib.Components.TD T3(
     nIn=1,
     nOut=1,
     delay=1)
@@ -95,27 +95,27 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-8,-54})));
-  PNlib.PD onecup(nIn=1, nOut=1,
+  PNlib.Components.PD onecup(nIn=1, nOut=1,
     maxTokens=1)                 annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-46,-10})));
-  PNlib.PD twocups(nIn=1, nOut=1,
+  PNlib.Components.PD twocups(nIn=1, nOut=1,
     maxTokens=1)                  annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-46,-54})));
-  PNlib.TD T4(nIn=1, nOut=1,
+  PNlib.Components.TD T4(nIn=1, nOut=1,
     arcWeightOut={1})        annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-74,-10})));
-  PNlib.TD T5(nIn=1, nOut=1,
+  PNlib.Components.TD T5(nIn=1, nOut=1,
     arcWeightOut={2})        annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-74,-54})));
-  PNlib.TC scalding(
+  PNlib.Components.TC scalding(
     maximumSpeed=0.003125,
     nIn=3,
     nOut=2,
@@ -129,20 +129,20 @@ model Senseo_Maschine
             {7,2.00002}},
         rotation=90,
         origin={-36,41})));
-  PNlib.PC coffee_cup(nIn=1, nOut=1)
+  PNlib.Components.PC coffee_cup(nIn=1, nOut=1)
                          annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-144,-74})));
-  inner PNlib.Settings settings
+  inner PNlib.Components.Settings settings
     annotation(Placement(transformation(extent={{156,-158},{182,-132}})));
-  PNlib.PD ready(
+  PNlib.Components.PD ready(
     maxTokens=1,
     nIn=1,
     nOut=1,
     startTokens=0)
     annotation(Placement(transformation(extent={{-102,-130},{-82,-110}})));
-  PNlib.TD T7(
+  PNlib.Components.TD T7(
     nIn=2,
     nOut=2,
     firingCon=pre(disamount.t) > 0,
@@ -152,22 +152,22 @@ model Senseo_Maschine
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-144,-108})));
-  PNlib.PD amountCups(nIn=1) annotation(Placement(transformation(
+  PNlib.Components.PD amountCups(nIn=1) annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-144,-152})));
-  PNlib.PD disamount(nIn=3, nOut=2) annotation(Placement(transformation(
+  PNlib.Components.PD disamount(nIn=3, nOut=2) annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=180,
         origin={-106,-32})));
-  PNlib.PD P1(
+  PNlib.Components.PD P1(
     nOut=3,
     maxTokens=1,
     nIn=1)  annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
         origin={-34,158})));
-  PNlib.PD P3(       nOut=1, nIn=1,
+  PNlib.Components.PD P3(       nOut=1, nIn=1,
     maxTokens=1)             annotation(Placement(transformation(
         extent={{-10,-10},{10,10}},
         rotation=270,
diff --git a/PNlib/Examples/Models/Senseo/Senseo_Model.mo b/PNlib/Examples/Models/Senseo/Senseo_Model.mo
index bfcef49b..0c631cd7 100644
--- a/PNlib/Examples/Models/Senseo/Senseo_Model.mo
+++ b/PNlib/Examples/Models/Senseo/Senseo_Model.mo
@@ -18,7 +18,7 @@ model Senseo_Model "Top Model"
     annotation(Placement(transformation(extent={{-24,44},{-4,64}})));
   Counter_real counter_real(text="Temperature", hmax=90)
     annotation(Placement(transformation(extent={{66,42},{104,80}})));
-  inner PNlib.Settings settings annotation(
+  inner PNlib.Components.Settings settings annotation(
     Placement(visible = true, transformation(origin = {-90, 70}, extent = {{-10, -10}, {10, 10}}, rotation = 0)));
 equation
   connect(senseo_Maschine.amount_cups_, amount_cups.levelSensor)
diff --git a/PNlib/Interfaces/package.mo b/PNlib/Interfaces/package.mo
index 264ac968..90c92514 100644
--- a/PNlib/Interfaces/package.mo
+++ b/PNlib/Interfaces/package.mo
@@ -1,4 +1,4 @@
 within PNlib;
 package Interfaces "contains the connectors for the Petri net component models"
-
+  extends Modelica.Icons.InterfacesPackage;
 end Interfaces;
diff --git a/PNlib/Contact.mo b/PNlib/UsersGuide/Contact.mo
similarity index 98%
rename from PNlib/Contact.mo
rename to PNlib/UsersGuide/Contact.mo
index dd6483b4..6bd7e188 100644
--- a/PNlib/Contact.mo
+++ b/PNlib/UsersGuide/Contact.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.UsersGuide;
 model Contact
 extends Modelica.Icons.Contact;
  annotation(Documentation(info="<html>
diff --git a/PNlib/References.mo b/PNlib/UsersGuide/References.mo
similarity index 98%
rename from PNlib/References.mo
rename to PNlib/UsersGuide/References.mo
index 809bcd79..c4b90299 100644
--- a/PNlib/References.mo
+++ b/PNlib/UsersGuide/References.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.UsersGuide;
 model References
  extends Modelica.Icons.References;
   annotation(Documentation(info="<html>
diff --git a/PNlib/RevisionHistory.mo b/PNlib/UsersGuide/RevisionHistory.mo
similarity index 98%
rename from PNlib/RevisionHistory.mo
rename to PNlib/UsersGuide/RevisionHistory.mo
index 3a756d16..b94445ec 100644
--- a/PNlib/RevisionHistory.mo
+++ b/PNlib/UsersGuide/RevisionHistory.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.UsersGuide;
 model RevisionHistory
 extends Modelica.Icons.ReleaseNotes;
 annotation(Documentation(
diff --git a/PNlib/UserGuide.mo b/PNlib/UsersGuide/UserGuide.mo
similarity index 99%
rename from PNlib/UserGuide.mo
rename to PNlib/UsersGuide/UserGuide.mo
index a056afee..0191bdb4 100644
--- a/PNlib/UserGuide.mo
+++ b/PNlib/UsersGuide/UserGuide.mo
@@ -1,4 +1,4 @@
-within PNlib;
+within PNlib.UsersGuide;
 model UserGuide
  extends Modelica.Icons.Information;
   annotation(Documentation(info="<html>
diff --git a/PNlib/UsersGuide/package.mo b/PNlib/UsersGuide/package.mo
new file mode 100644
index 00000000..e800e1ca
--- /dev/null
+++ b/PNlib/UsersGuide/package.mo
@@ -0,0 +1,8 @@
+within PNlib;
+package UsersGuide "Package containing explanations, references and contact information."
+extends ModelicaReference.Icons.Information;
+
+
+
+
+end UsersGuide;
diff --git a/PNlib/UsersGuide/package.order b/PNlib/UsersGuide/package.order
new file mode 100644
index 00000000..6b2ef7de
--- /dev/null
+++ b/PNlib/UsersGuide/package.order
@@ -0,0 +1,4 @@
+UserGuide
+References
+Contact
+RevisionHistory
diff --git a/PNlib/package.order b/PNlib/package.order
index f48538f7..19793860 100644
--- a/PNlib/package.order
+++ b/PNlib/package.order
@@ -1,24 +1,8 @@
-UserGuide
-References
-Contact
-RevisionHistory
-PD
-PC
-T
-TD
-TDS
-TE
-TES
-TFD
-TFDS
-TT
-TC
-TA
-IA
-Settings
+UsersGuide
+Examples
+Components
 Interfaces
 Blocks
 Functions
 Constants
 Types
-Examples
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos
index 47310c7b..f55c53c5 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.Conflict.mos
@@ -39,7 +39,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.Conflict_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.Conflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
index 6efba5f2..ffe031a4 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.ConflictLoop.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.ConflictLoop_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ConflictLoop', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos
index 992fc915..f91955c6 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.LoopAndArcweight.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.LoopAndArcweight_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.LoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos
index e19d88ee..16004d2a 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTC.mos
@@ -31,7 +31,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.PCtoTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.PCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos
index 7b055d5e..bb84b0b4 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.PCtoTCfunction.mos
@@ -31,7 +31,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.PCtoTCfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.PCtoTCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos
index 6a986894..0afdbe67 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.SinglePC.mos
@@ -28,7 +28,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.SinglePC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.SinglePC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos
index 2f449165..50ec9139 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.SingleTC.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.SingleTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.SingleTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // ""
 // {"T1.fire","T1.instantaneousSpeed","T1.maximumSpeed"}
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos
index 17ede85c..d09648c1 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.Speed.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.Speed_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.Speed', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos
index cda84e5b..24662d6e 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPC.mos
@@ -31,7 +31,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.TCtoPC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.TCtoPC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos
index 1db4fc12..3d478e05 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.TCtoPCfunction.mos
@@ -31,7 +31,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.TCtoPCfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.TCtoPCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos
index 5ba19268..9b9a087d 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroArcWeight.mos
@@ -33,7 +33,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.ZeroArcWeight_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 12.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ZeroArcWeight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos
index 5c276555..0b99a9e6 100644
--- a/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ConTest.ZeroPlace.mos
@@ -35,7 +35,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ConTest.ZeroPlace_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ConTest.ZeroPlace', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos
index 2f9823a4..72f689cd 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneBaB.mos
@@ -48,7 +48,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.ConflictBeneBaB_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos
index 0dd31332..5440a269 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneGreedy.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.ConflictBeneGreedy_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos
index 2ff39ee2..9958e645 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictBeneQuotient.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.ConflictBeneQuotient_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos
index c2caaf21..70c327ce 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.ConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
index 4e6a90a3..9b51ef5e 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.ConflictProb.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.ConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.ConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
index c6f94f3f..949d2c10 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.DisLoopAndArcweight.mos
@@ -31,7 +31,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.DisLoopAndArcweight_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.DisLoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos
index dd5bb719..1f8ce76e 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.EightConflictProb.mos
@@ -44,7 +44,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.EightConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.EightConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos
index 91cc7c23..ce7bf5d4 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.FiveTimes.mos
@@ -53,7 +53,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.FiveTimes_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.FiveTimes', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos
index 853a0eb5..fd9b28e8 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneBaB.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.InputConflictBeneBaB_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos
index 27a497d9..a247c0b8 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneGreedy.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.InputConflictBeneGreedy_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos
index e817d519..3e685028 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictBeneQuotient.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.InputConflictBeneQuotient_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos
index 46b4fc11..79ce209b 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.InputConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
index bc8642f2..49ca05ae 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.InputConflictProb.mos
@@ -37,7 +37,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.InputConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.InputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos
index 9b1a3f39..1914c510 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.NoInputConflict.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.NoInputConflict_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 3.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.NoInputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos
index 854a1ba8..86509f99 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneBaB.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.OutputConflictBeneBaB_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneBaB', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos
index b972c41f..c3621cdb 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneGreedy.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.OutputConflictBeneGreedy_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneGreedy', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos
index df4646a7..f97486e2 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictBeneQuotient.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.OutputConflictBeneQuotient_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictBeneQuotient', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos
index 5905db36..57a376c7 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.OutputConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
index fe331944..e463054e 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.OutputConflictProb.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.OutputConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.OutputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos
index da365bfb..999a5efb 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTD.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.PDtoTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos
index 6da2c5f3..7abea8a0 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTDfunction.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.PDtoTDfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos
index 8708b9e7..e9ba1146 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.PDtoTT.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.PDtoTT_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PDtoTT', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos
index 5330a354..0117949c 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.PrioTest.mos
@@ -42,7 +42,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.PrioTest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.PrioTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos
index 15065b45..d2625600 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.SinglePD.mos
@@ -28,7 +28,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.SinglePD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SinglePD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos
index bb64c782..cbf1b484 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.SingleTD.mos
@@ -29,7 +29,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.SingleTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SingleTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos
index c0dd876d..7224a582 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.SixConflictProb.mos
@@ -40,7 +40,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.SixConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.SixConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos
index 0a44219d..85ed15eb 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPD.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TDtoPD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TDtoPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos
index 9065d383..d0568409 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TDtoPDfunction.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TDtoPDfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TDtoPDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos
index 093db8b1..181f04f2 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TEnoInput.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TEnoInput_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TEnoInput', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos
index 84a92ac4..b9656792 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TEtest.mos
@@ -33,7 +33,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TEtest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TEtest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos
index 2546c0e0..774edab5 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDinputConflict.mos
@@ -40,7 +40,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TFDinputConflict_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDinputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos
index 2a087f5f..fde17b40 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutCap.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TFDoutCap_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDoutCap', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos
index 676940fb..bc1e6879 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDoutputConflict.mos
@@ -42,7 +42,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TFDoutputConflict_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDoutputConflict', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos
index f5d87eb5..b3a51fba 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TFDtest.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TFDtest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TFDtest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos
index 3a8f9c5f..583fb6b4 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TTcircle.mos
@@ -33,7 +33,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TTcircle_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TTcircle', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos
index 2a9ac65c..d367f7a7 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.TTtoPD.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.TTtoPD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.TTtoPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos b/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos
index b5a297c0..3f671b18 100644
--- a/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.DisTest.Ttest.mos
@@ -39,7 +39,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.DisTest.Ttest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.DisTest.Ttest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos
index acc7fb3b..c742dc29 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC.mos
@@ -47,7 +47,9 @@ vars := {
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 1.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos
index b06e7883..0336974d 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC2.mos
@@ -50,7 +50,9 @@ vars := {
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos
index 92bd6bbc..3180857d 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.ArcswithPCtoTC3.mos
@@ -50,10 +50,12 @@ vars := {
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.ArcswithPCtoTC3_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 2.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.ArcswithPCtoTC3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use -d=tearingdump and -d=tearingdumpV for more information.
-// [BackEnd/Differentiate.mo:388:3-388:155:writable] Error: Derivative of expression "$res[2] := min(min(min({P1.decFactorOut[2], P3.decFactorOut[2], P5.decFactorOut[2], P7.decFactorOut[2]}), min({})), P1.prelimSpeedOut[2]) - T5.instantaneousSpeed" w.r.t. "dummyVarNLSJac0" is non-existent.
+// [BackEnd/Differentiate.mo:388:3-388:155:writable] Error: Derivative of expression "$res3 := min(min(min({P1.decFactorOut[2], P3.decFactorOut[2], P5.decFactorOut[2], P7.decFactorOut[2]}), min({})), P1.prelimSpeedOut[2]) - T5.instantaneousSpeed" w.r.t. "dummyVarNLSJac0" is non-existent.
 // Error: Internal error SymbolicJacobian.deriveAll failed
 // [BackEnd/SymbolicJacobian.mo:0:0-0:0:writable] Error: Internal error function generateSymbolicJacobian failed
 // [BackEnd/SymbolicJacobian.mo:0:0-0:0:writable] Error: Internal error function createJacobian failed
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos
index 512de2d7..37b482a3 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPCtoTC.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPCtoTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use -d=tearingdump and -d=tearingdumpV for more information.
 // Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos
index 62c06368..4237a816 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPTtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos
index d75a2bcf..53809d90 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.DoubleArcwithPTtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos
index 0e817eea..3764dbf9 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.IATest.mos
@@ -39,7 +39,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.IATest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 6.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IATest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos
index e5e39ac4..b78abca9 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPCtoTC.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.IAwithPCtoTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use -d=tearingdump and -d=tearingdumpV for more information.
 // Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos
index ccb27217..08a63d16 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.IAwithPDtoTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos
index 80087828..6404604c 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.IAwithPDtoTD2.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.IAwithPDtoTD2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.IAwithPDtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos
index 298ef8ed..2babcba3 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.NoTokens.mos
@@ -37,7 +37,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.NoTokens_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 12.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.NoTokens', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//    messages = ""
+//    messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos
index 8501b68b..83f7191b 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TATest.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TATest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 6.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TATest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos
index eb490a7b..f949640b 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPCtoTC.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TAwithPCtoTC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPCtoTC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The Tearing heuristic has chosen variables with annotation attribute 'tearingSelect = avoid'. Use -d=tearingdump and -d=tearingdumpV for more information.
 // Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos
index 91a37caf..480aad6e 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TAwithPDtoTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPDtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos
index 16bbea6c..361d3572 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithPDtoTD2.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TAwithPDtoTD2_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithPDtoTD2', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos
index 4d96f3fe..32c3ab87 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TAwithWeaklyActivation.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TAwithWeaklyActivation_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TAwithWeaklyActivation', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos
index ce553f63..25ad90f7 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTest.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDSTest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos
index 93ea6d87..a377fdb2 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSTestinterrupt.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDSTestinterrupt_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 8.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSTestinterrupt', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos
index 831ce464..4ab43987 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSdiscrete.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDSdiscrete_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 60.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSdiscrete', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos
index 81f88e71..071082a6 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStriangular.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDStriangular_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDStriangular', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos
index 7911bf90..ac3af5c2 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDStruncatednormal.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDStruncatednormal_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDStruncatednormal', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos
index 1130af13..eb4b2ca2 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TDSuniform.mos
@@ -32,7 +32,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TDSuniform_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 20.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TDSuniform', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos
index a009d9b4..61805921 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TESTest.mos
@@ -34,7 +34,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TESTest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TESTest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos b/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos
index 41b60312..a2118491 100644
--- a/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos
+++ b/Testing/OpenModelica/PNlib.Examples.ExtTest.TFDStest.mos
@@ -35,7 +35,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.ExtTest.TFDStest_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-006, method = 'dassl', fileNamePrefix = 'PNlib.Examples.ExtTest.TFDStest', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos
index 7b063576..7ef8428b 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.ConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos
index dca80a90..69b46fc5 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictProb.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.ConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos
index 57a57499..8375fa58 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType3.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.ConflictType3_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos
index a5f8f133..7a4e1df7 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.ConflictType4.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.ConflictType4_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.ConflictType4', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos
index 9c6ea762..3435f543 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.EightConflictProb.mos
@@ -44,7 +44,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.EightConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.EightConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos
index c6d66da7..60d305ae 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.HybLoopAndArcweight.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.HybLoopAndArcweight_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.HybLoopAndArcweight', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos
index b08323be..c207758c 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.InputConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos
index ce2c5328..2840e647 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictProb.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.InputConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos
index c0d5f387..0f7514ba 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.InputConflictType3.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.InputConflictType3_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.InputConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos
index 7584c685..2c3bb788 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictPrio.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.OutputConflictPrio_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictPrio', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos
index 627810b2..c1da19f2 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictProb.mos
@@ -36,7 +36,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.OutputConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos
index 4ca6dd8a..d2a99920 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.OutputConflictType3.mos
@@ -38,7 +38,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.OutputConflictType3_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.OutputConflictType3', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos
index 776dc783..77490671 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTD.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.PCtoTD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.PCtoTD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos
index d7622b88..32388e25 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.PCtoTDfunction.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.PCtoTDfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.PCtoTDfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos
index 479f955b..70009611 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.SixConflictProb.mos
@@ -40,7 +40,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.SixConflictProb_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.SixConflictProb', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos
index 912c9949..5dff2486 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.TCwithPD.mos
@@ -33,7 +33,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.TCwithPD_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TCwithPD', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos
index 333d7d0b..cfbabd8f 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPC.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.TDtoPC_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 10.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TDtoPC', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos
index 4165032e..4f26e225 100644
--- a/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos
+++ b/Testing/OpenModelica/PNlib.Examples.HybTest.TDtoPCfunction.mos
@@ -30,7 +30,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.HybTest.TDtoPCfunction_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 5.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.HybTest.TDtoPCfunction', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos b/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos
index aa1adcd0..bb026ab6 100644
--- a/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos
+++ b/Testing/OpenModelica/PNlib.Examples.Models.BicoloredPlaces.Aquarium.mos
@@ -40,7 +40,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.Models.BicoloredPlaces.Aquarium_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 40.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.BicoloredPlaces.Aquarium', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // Warning: There are iteration variables with default zero start attribute. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
diff --git a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos
index e22048ce..f64bcfbc 100644
--- a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos
+++ b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station1.mos
@@ -43,7 +43,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.Models.FiliP.ModellStationen.Station1_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 365.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.FiliP.ModellStationen.Station1', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "
diff --git a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos
index b2a3a39e..f0120763 100644
--- a/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos
+++ b/Testing/OpenModelica/PNlib.Examples.Models.FiliP.ModellStationen.Station7.mos
@@ -119,7 +119,9 @@ end if;
 // record SimulationResult
 //     resultFile = "PNlib.Examples.Models.FiliP.ModellStationen.Station7_res.mat",
 //     simulationOptions = "startTime = 0.0, stopTime = 365.0, numberOfIntervals = 500, tolerance = 1e-06, method = 'dassl', fileNamePrefix = 'PNlib.Examples.Models.FiliP.ModellStationen.Station7', options = '', outputFormat = 'mat', variableFilter = '.*', cflags = '', simflags = ''",
-//     messages = ""
+//     messages = "stdout            | info    | The initialization finished successfully without homotopy method.
+// stdout | info    | The simulation finished successfully.
+// "
 // end SimulationResult;
 // "Warning: The initial conditions are not fully specified. For more information set -d=initialization. In OMEdit Tools->Options->Simulation->OMCFlags, in OMNotebook call setCommandLineOptions("-d=initialization").
 // "