diff --git a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop.ini b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop.ini
index 398d652..79b244b 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Clients.ini b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Clients.ini
index 270ac16..836f25d 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Clients.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Clients.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load.ini b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load.ini
index 6ea52cb..aed294d 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load_Refined.ini b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load_Refined.ini
index 8d9c60e..4a00997 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load_Refined.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Ping_Drop_Load_Refined.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Traffic_Drop.ini b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Traffic_Drop.ini
index e622bfd..6d1b6ce 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_ARP_Traffic_Drop.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_ARP_Traffic_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Clients.ini b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Clients.ini
index ea939fd..680dc9c 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Clients.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Clients.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Drop.ini b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Drop.ini
index 2e37a5f..acee20c 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Drop.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Flood.ini b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Flood.ini
index 4a06d35..7932f3f 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_Ping_Flood.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_Ping_Flood.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Drop.ini b/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Drop.ini
index 46ad496..9d1be17 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Drop.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Flood.ini b/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Flood.ini
index e9c8706..a17013b 100644
--- a/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Flood.ini
+++ b/scenarios/fattree/Scenario_DynamicFatTree_Traffic_Flood.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/fattree/example.ini b/scenarios/fattree/example.ini
index 3d9f0e4..00e04da 100644
--- a/scenarios/fattree/example.ini
+++ b/scenarios/fattree/example.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree
+network = scenarios.networks.Scenario_DynamicFatTree
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_2C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_2C.ini
index 52c44b6..7ceb15d 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_2C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_3C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_3C.ini
index 986679d..3aca264 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_3C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_4C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_4C.ini
index 143a5e2..7ebf953 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_4C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_5C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_5C.ini
index c37c152..8ada598 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_5C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_ARP_HF_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_2C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_2C.ini
index d888142..a532121 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_2C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_3C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_3C.ini
index 803c0d0..94a12e4 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_3C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_4C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_4C.ini
index dd6e337..dadb19f 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_4C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_5C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_5C.ini
index 055d309..b40f6e2 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_5C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_2C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_2C.ini
index 016ded3..14f8ac9 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_2C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_3C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_3C.ini
index ce38c2a..e197721 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_3C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_4C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_4C.ini
index f817a31..7b1eb44 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_4C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_5C.ini b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_5C.ini
index 21ef2c7..fe6c771 100644
--- a/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_5C.ini
+++ b/scenarios/hyperflow/fattree/Scenario_DynamicFatTree_HF_Ping_Flood_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_HF
+network = scenarios.networks.Scenario_DynamicFatTree_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_2C.ini b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_2C.ini
index b9b63b6..8dd9e94 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_2C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_3C.ini b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_3C.ini
index af2dbba..c8d8ba6 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_3C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_4C.ini b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_4C.ini
index 1f72342..4b5ab3c 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_4C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_5C.ini b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_5C.ini
index 7c68af3..ccbe36c 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_5C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_ARP_HF_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 
 
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_2C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_2C.ini
index 538cab8..9aa176e 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_2C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_3C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_3C.ini
index ea9bec9..c19e84b 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_3C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_4C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_4C.ini
index b1411de..21a65cd 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_4C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_5C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_5C.ini
index e2a2564..722d8cf 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_5C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_2C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_2C.ini
index 3bb9711..c912512 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_2C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_3C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_3C.ini
index 28ae628..84432a3 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_3C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_4C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_4C.ini
index 2267c5d..cc43d95 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_4C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_5C.ini b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_5C.ini
index 243adc7..44e3527 100644
--- a/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_5C.ini
+++ b/scenarios/hyperflow/usa/Scenario_USA_HF_Ping_Flood_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_HF
+network = scenarios.networks.Scenario_USA_HF
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_2CK4.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_2CK4.ini
index 62e497d..7eeb778 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_2CK4.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_2CK4.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_3C.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_3C.ini
index c0586e1..65c2af2 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_3C.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_PingLocal_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_2C.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_2C.ini
index 32c6207..e67e907 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_2C.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_3C.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_3C.ini
index 9914745..d2454cc 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_3C.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_4C.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_4C.ini
index 7195823..6d47d26 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_4C.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_5C.ini b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_5C.ini
index d0502d0..3277157 100644
--- a/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_5C.ini
+++ b/scenarios/kandoo/fattree/Scenario_DynamicFatTree_ARP_KN_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/fattree/TestScenario_DynamicFatTree_ARP_KN_Ping_4C.ini b/scenarios/kandoo/fattree/TestScenario_DynamicFatTree_ARP_KN_Ping_4C.ini
index 07de889..11ab74e 100644
--- a/scenarios/kandoo/fattree/TestScenario_DynamicFatTree_ARP_KN_Ping_4C.ini
+++ b/scenarios/kandoo/fattree/TestScenario_DynamicFatTree_ARP_KN_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_DynamicFatTree_KN
+network = scenarios.networks.Scenario_DynamicFatTree_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_2C.ini b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_2C.ini
index 91f08c2..50043c6 100644
--- a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_2C.ini
+++ b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_2C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_KN
+network = scenarios.networks.Scenario_USA_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_3C.ini b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_3C.ini
index ec1999b..b57bf9e 100644
--- a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_3C.ini
+++ b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_3C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_KN
+network = scenarios.networks.Scenario_USA_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_4C.ini b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_4C.ini
index 924dbb2..bb37f4e 100644
--- a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_4C.ini
+++ b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_4C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_KN
+network = scenarios.networks.Scenario_USA_KN
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_5C.ini b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_5C.ini
index c4a7c61..6628dd5 100644
--- a/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_5C.ini
+++ b/scenarios/kandoo/usa/Scenario_USA_ARP_KN_Ping_5C.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA_KN
+network = scenarios.networks.Scenario_USA_KN
 
 
 
diff --git a/scenarios/networks/Agis.ned b/scenarios/networks/Agis.ned
index df50405..d2b25ef 100644
--- a/scenarios/networks/Agis.ned
+++ b/scenarios/networks/Agis.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Agis_KN.ned b/scenarios/networks/Agis_KN.ned
index 4c3e7ce..23bdba2 100644
--- a/scenarios/networks/Agis_KN.ned
+++ b/scenarios/networks/Agis_KN.ned
@@ -12,8 +12,7 @@
 // You should have received a copy of the GNU Lesser General Public License
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
-
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arn.ned b/scenarios/networks/Arn.ned
index 1dda39e..5be3971 100644
--- a/scenarios/networks/Arn.ned
+++ b/scenarios/networks/Arn.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arn_KN.ned b/scenarios/networks/Arn_KN.ned
index fe07e95..7297cbe 100644
--- a/scenarios/networks/Arn_KN.ned
+++ b/scenarios/networks/Arn_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arnes.ned b/scenarios/networks/Arnes.ned
index bcc14aa..5e79f14 100644
--- a/scenarios/networks/Arnes.ned
+++ b/scenarios/networks/Arnes.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arnes_KN.ned b/scenarios/networks/Arnes_KN.ned
index b719614..d962d87 100644
--- a/scenarios/networks/Arnes_KN.ned
+++ b/scenarios/networks/Arnes_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arpanet19723.ned b/scenarios/networks/Arpanet19723.ned
index 60edaec..656941c 100644
--- a/scenarios/networks/Arpanet19723.ned
+++ b/scenarios/networks/Arpanet19723.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arpanet19723_KN.ned b/scenarios/networks/Arpanet19723_KN.ned
index 9bcf6e5..d93157f 100644
--- a/scenarios/networks/Arpanet19723_KN.ned
+++ b/scenarios/networks/Arpanet19723_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arpanet19728.ned b/scenarios/networks/Arpanet19728.ned
index ed31f58..31d3662 100644
--- a/scenarios/networks/Arpanet19728.ned
+++ b/scenarios/networks/Arpanet19728.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Arpanet19728_KN.ned b/scenarios/networks/Arpanet19728_KN.ned
index 314d0f4..ca829d2 100644
--- a/scenarios/networks/Arpanet19728_KN.ned
+++ b/scenarios/networks/Arpanet19728_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/AttMpls.ned b/scenarios/networks/AttMpls.ned
index 7deb078..4d1bd5f 100644
--- a/scenarios/networks/AttMpls.ned
+++ b/scenarios/networks/AttMpls.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/AttMpls_KN.ned b/scenarios/networks/AttMpls_KN.ned
index 675b5d0..21b0d30 100644
--- a/scenarios/networks/AttMpls_KN.ned
+++ b/scenarios/networks/AttMpls_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bbnplanet.ned b/scenarios/networks/Bbnplanet.ned
index 81fd61d..424045c 100644
--- a/scenarios/networks/Bbnplanet.ned
+++ b/scenarios/networks/Bbnplanet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bbnplanet_KN.ned b/scenarios/networks/Bbnplanet_KN.ned
index 5a7b7bc..b4d2b16 100644
--- a/scenarios/networks/Bbnplanet_KN.ned
+++ b/scenarios/networks/Bbnplanet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/BeyondTheNetwork.ned b/scenarios/networks/BeyondTheNetwork.ned
index 313183f..d7135f7 100644
--- a/scenarios/networks/BeyondTheNetwork.ned
+++ b/scenarios/networks/BeyondTheNetwork.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/BeyondTheNetwork_KN.ned b/scenarios/networks/BeyondTheNetwork_KN.ned
index 0d726c9..2f518fa 100644
--- a/scenarios/networks/BeyondTheNetwork_KN.ned
+++ b/scenarios/networks/BeyondTheNetwork_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bics.ned b/scenarios/networks/Bics.ned
index 45ee2b6..1d6cd81 100644
--- a/scenarios/networks/Bics.ned
+++ b/scenarios/networks/Bics.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bics_KN.ned b/scenarios/networks/Bics_KN.ned
index be63220..2a1bd4e 100644
--- a/scenarios/networks/Bics_KN.ned
+++ b/scenarios/networks/Bics_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Biznet.ned b/scenarios/networks/Biznet.ned
index 148af1b..189c73d 100644
--- a/scenarios/networks/Biznet.ned
+++ b/scenarios/networks/Biznet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Biznet_KN.ned b/scenarios/networks/Biznet_KN.ned
index aeef9c4..644ffe5 100644
--- a/scenarios/networks/Biznet_KN.ned
+++ b/scenarios/networks/Biznet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bren.ned b/scenarios/networks/Bren.ned
index 36605b7..e846070 100644
--- a/scenarios/networks/Bren.ned
+++ b/scenarios/networks/Bren.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Bren_KN.ned b/scenarios/networks/Bren_KN.ned
index f090722..cdcee64 100644
--- a/scenarios/networks/Bren_KN.ned
+++ b/scenarios/networks/Bren_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/BtNorthAmerica.ned b/scenarios/networks/BtNorthAmerica.ned
index a93a7a0..422b6c5 100644
--- a/scenarios/networks/BtNorthAmerica.ned
+++ b/scenarios/networks/BtNorthAmerica.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/BtNorthAmerica_KN.ned b/scenarios/networks/BtNorthAmerica_KN.ned
index b09f01a..cbbb43e 100644
--- a/scenarios/networks/BtNorthAmerica_KN.ned
+++ b/scenarios/networks/BtNorthAmerica_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cernet.ned b/scenarios/networks/Cernet.ned
index 1cc3228..94a68b4 100644
--- a/scenarios/networks/Cernet.ned
+++ b/scenarios/networks/Cernet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cernet_KN.ned b/scenarios/networks/Cernet_KN.ned
index 7a9d8a4..b6e65d3 100644
--- a/scenarios/networks/Cernet_KN.ned
+++ b/scenarios/networks/Cernet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200304.ned b/scenarios/networks/Cesnet200304.ned
index efabbf8..ebb8e73 100644
--- a/scenarios/networks/Cesnet200304.ned
+++ b/scenarios/networks/Cesnet200304.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200304_KN.ned b/scenarios/networks/Cesnet200304_KN.ned
index e3be401..b6609af 100644
--- a/scenarios/networks/Cesnet200304_KN.ned
+++ b/scenarios/networks/Cesnet200304_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200511.ned b/scenarios/networks/Cesnet200511.ned
index 244f3c7..25ee0e5 100644
--- a/scenarios/networks/Cesnet200511.ned
+++ b/scenarios/networks/Cesnet200511.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200511_KN.ned b/scenarios/networks/Cesnet200511_KN.ned
index 1d7f3ce..ef9a140 100644
--- a/scenarios/networks/Cesnet200511_KN.ned
+++ b/scenarios/networks/Cesnet200511_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200603.ned b/scenarios/networks/Cesnet200603.ned
index 5d3db9b..1e09928 100644
--- a/scenarios/networks/Cesnet200603.ned
+++ b/scenarios/networks/Cesnet200603.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200603_KN.ned b/scenarios/networks/Cesnet200603_KN.ned
index e9b35c3..8fdf247 100644
--- a/scenarios/networks/Cesnet200603_KN.ned
+++ b/scenarios/networks/Cesnet200603_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200706.ned b/scenarios/networks/Cesnet200706.ned
index f61177f..72f80f9 100644
--- a/scenarios/networks/Cesnet200706.ned
+++ b/scenarios/networks/Cesnet200706.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Cesnet200706_KN.ned b/scenarios/networks/Cesnet200706_KN.ned
index 74fb14b..8d72a12 100644
--- a/scenarios/networks/Cesnet200706_KN.ned
+++ b/scenarios/networks/Cesnet200706_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Chinanet.ned b/scenarios/networks/Chinanet.ned
index e0a0266..510f376 100644
--- a/scenarios/networks/Chinanet.ned
+++ b/scenarios/networks/Chinanet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Chinanet_KN.ned b/scenarios/networks/Chinanet_KN.ned
index a45ca60..b1fe9f8 100644
--- a/scenarios/networks/Chinanet_KN.ned
+++ b/scenarios/networks/Chinanet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/CrlNetworkServices.ned b/scenarios/networks/CrlNetworkServices.ned
index b824335..e49e879 100644
--- a/scenarios/networks/CrlNetworkServices.ned
+++ b/scenarios/networks/CrlNetworkServices.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/CrlNetworkServices_KN.ned b/scenarios/networks/CrlNetworkServices_KN.ned
index 22d822e..4950f8a 100644
--- a/scenarios/networks/CrlNetworkServices_KN.ned
+++ b/scenarios/networks/CrlNetworkServices_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Darkstrand.ned b/scenarios/networks/Darkstrand.ned
index ffcb395..04c24dd 100644
--- a/scenarios/networks/Darkstrand.ned
+++ b/scenarios/networks/Darkstrand.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Darkstrand_KN.ned b/scenarios/networks/Darkstrand_KN.ned
index afcda21..9ed3c3a 100644
--- a/scenarios/networks/Darkstrand_KN.ned
+++ b/scenarios/networks/Darkstrand_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Digex.ned b/scenarios/networks/Digex.ned
index aa6d24f..47c1ad3 100644
--- a/scenarios/networks/Digex.ned
+++ b/scenarios/networks/Digex.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Digex_KN.ned b/scenarios/networks/Digex_KN.ned
index 28d4cc9..defeee2 100644
--- a/scenarios/networks/Digex_KN.ned
+++ b/scenarios/networks/Digex_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Evolink.ned b/scenarios/networks/Evolink.ned
index 806a7e5..2fd1ddb 100644
--- a/scenarios/networks/Evolink.ned
+++ b/scenarios/networks/Evolink.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Evolink_KN.ned b/scenarios/networks/Evolink_KN.ned
index 4a006f0..c245dce 100644
--- a/scenarios/networks/Evolink_KN.ned
+++ b/scenarios/networks/Evolink_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2001.ned b/scenarios/networks/Geant2001.ned
index c19d90c..04196fc 100644
--- a/scenarios/networks/Geant2001.ned
+++ b/scenarios/networks/Geant2001.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2001_KN.ned b/scenarios/networks/Geant2001_KN.ned
index 23cecc5..fc5da94 100644
--- a/scenarios/networks/Geant2001_KN.ned
+++ b/scenarios/networks/Geant2001_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2009.ned b/scenarios/networks/Geant2009.ned
index 07f1e08..d1fd352 100644
--- a/scenarios/networks/Geant2009.ned
+++ b/scenarios/networks/Geant2009.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2009_KN.ned b/scenarios/networks/Geant2009_KN.ned
index 204a183..938fe19 100644
--- a/scenarios/networks/Geant2009_KN.ned
+++ b/scenarios/networks/Geant2009_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2010.ned b/scenarios/networks/Geant2010.ned
index 7a80a1f..2688d69 100644
--- a/scenarios/networks/Geant2010.ned
+++ b/scenarios/networks/Geant2010.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2010_KN.ned b/scenarios/networks/Geant2010_KN.ned
index a35efbc..029fbee 100644
--- a/scenarios/networks/Geant2010_KN.ned
+++ b/scenarios/networks/Geant2010_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2012.ned b/scenarios/networks/Geant2012.ned
index 7786dd9..e10867d 100644
--- a/scenarios/networks/Geant2012.ned
+++ b/scenarios/networks/Geant2012.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Geant2012_KN.ned b/scenarios/networks/Geant2012_KN.ned
index 06d7b1e..811b667 100644
--- a/scenarios/networks/Geant2012_KN.ned
+++ b/scenarios/networks/Geant2012_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Grnet.ned b/scenarios/networks/Grnet.ned
index 047ca44..aac56af 100644
--- a/scenarios/networks/Grnet.ned
+++ b/scenarios/networks/Grnet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Grnet_KN.ned b/scenarios/networks/Grnet_KN.ned
index 4d26f07..5e2fd03 100644
--- a/scenarios/networks/Grnet_KN.ned
+++ b/scenarios/networks/Grnet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsCzechRepublic.ned b/scenarios/networks/GtsCzechRepublic.ned
index 6722aa4..2e67749 100644
--- a/scenarios/networks/GtsCzechRepublic.ned
+++ b/scenarios/networks/GtsCzechRepublic.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsCzechRepublic_KN.ned b/scenarios/networks/GtsCzechRepublic_KN.ned
index 0e96c58..54cfa35 100644
--- a/scenarios/networks/GtsCzechRepublic_KN.ned
+++ b/scenarios/networks/GtsCzechRepublic_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsPoland.ned b/scenarios/networks/GtsPoland.ned
index d03a213..68ddfa3 100644
--- a/scenarios/networks/GtsPoland.ned
+++ b/scenarios/networks/GtsPoland.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsPoland_KN.ned b/scenarios/networks/GtsPoland_KN.ned
index bf3a048..4ff3a54 100644
--- a/scenarios/networks/GtsPoland_KN.ned
+++ b/scenarios/networks/GtsPoland_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsSlovakia.ned b/scenarios/networks/GtsSlovakia.ned
index 03039aa..a7eb1ef 100644
--- a/scenarios/networks/GtsSlovakia.ned
+++ b/scenarios/networks/GtsSlovakia.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/GtsSlovakia_KN.ned b/scenarios/networks/GtsSlovakia_KN.ned
index 106d581..6d49bbd 100644
--- a/scenarios/networks/GtsSlovakia_KN.ned
+++ b/scenarios/networks/GtsSlovakia_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Iij.ned b/scenarios/networks/Iij.ned
index bd9a7f5..45582dd 100644
--- a/scenarios/networks/Iij.ned
+++ b/scenarios/networks/Iij.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Iij_KN.ned b/scenarios/networks/Iij_KN.ned
index a957b6b..9ca453e 100644
--- a/scenarios/networks/Iij_KN.ned
+++ b/scenarios/networks/Iij_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Integra.ned b/scenarios/networks/Integra.ned
index 3cf171b..5df186a 100644
--- a/scenarios/networks/Integra.ned
+++ b/scenarios/networks/Integra.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Integra_KN.ned b/scenarios/networks/Integra_KN.ned
index 665f388..76d404c 100644
--- a/scenarios/networks/Integra_KN.ned
+++ b/scenarios/networks/Integra_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Janetbackbone.ned b/scenarios/networks/Janetbackbone.ned
index 6f5f231..763064e 100644
--- a/scenarios/networks/Janetbackbone.ned
+++ b/scenarios/networks/Janetbackbone.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Janetbackbone_KN.ned b/scenarios/networks/Janetbackbone_KN.ned
index 04d66f9..0dab7c8 100644
--- a/scenarios/networks/Janetbackbone_KN.ned
+++ b/scenarios/networks/Janetbackbone_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/KentmanFeb2008.ned b/scenarios/networks/KentmanFeb2008.ned
index 0b4fdf8..e2e5f19 100644
--- a/scenarios/networks/KentmanFeb2008.ned
+++ b/scenarios/networks/KentmanFeb2008.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/KentmanFeb2008_KN.ned b/scenarios/networks/KentmanFeb2008_KN.ned
index c04dae6..4044e5b 100644
--- a/scenarios/networks/KentmanFeb2008_KN.ned
+++ b/scenarios/networks/KentmanFeb2008_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/KentmanJan2011.ned b/scenarios/networks/KentmanJan2011.ned
index aca79d4..4944412 100644
--- a/scenarios/networks/KentmanJan2011.ned
+++ b/scenarios/networks/KentmanJan2011.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/KentmanJan2011_KN.ned b/scenarios/networks/KentmanJan2011_KN.ned
index 34e941a..890be30 100644
--- a/scenarios/networks/KentmanJan2011_KN.ned
+++ b/scenarios/networks/KentmanJan2011_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/LambdaNet.ned b/scenarios/networks/LambdaNet.ned
index cc00d24..92e440b 100644
--- a/scenarios/networks/LambdaNet.ned
+++ b/scenarios/networks/LambdaNet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/LambdaNet_KN.ned b/scenarios/networks/LambdaNet_KN.ned
index 8f89b8f..5bf1599 100644
--- a/scenarios/networks/LambdaNet_KN.ned
+++ b/scenarios/networks/LambdaNet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Litnet.ned b/scenarios/networks/Litnet.ned
index bb62de5..2bdbfc0 100644
--- a/scenarios/networks/Litnet.ned
+++ b/scenarios/networks/Litnet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Litnet_KN.ned b/scenarios/networks/Litnet_KN.ned
index 6d3046d..22bfad2 100644
--- a/scenarios/networks/Litnet_KN.ned
+++ b/scenarios/networks/Litnet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/NetworkUsa.ned b/scenarios/networks/NetworkUsa.ned
index 7ff75dc..d9ddc26 100644
--- a/scenarios/networks/NetworkUsa.ned
+++ b/scenarios/networks/NetworkUsa.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/NetworkUsa_KN.ned b/scenarios/networks/NetworkUsa_KN.ned
index 69a0b6b..758c69f 100644
--- a/scenarios/networks/NetworkUsa_KN.ned
+++ b/scenarios/networks/NetworkUsa_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Niif.ned b/scenarios/networks/Niif.ned
index 188ed00..c3bfae6 100644
--- a/scenarios/networks/Niif.ned
+++ b/scenarios/networks/Niif.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Niif_KN.ned b/scenarios/networks/Niif_KN.ned
index 3071b88..9efab7a 100644
--- a/scenarios/networks/Niif_KN.ned
+++ b/scenarios/networks/Niif_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/PionierL3.ned b/scenarios/networks/PionierL3.ned
index 7eff0de..8a445e8 100644
--- a/scenarios/networks/PionierL3.ned
+++ b/scenarios/networks/PionierL3.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/PionierL3_KN.ned b/scenarios/networks/PionierL3_KN.ned
index 74cee10..538bd17 100644
--- a/scenarios/networks/PionierL3_KN.ned
+++ b/scenarios/networks/PionierL3_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2006.ned b/scenarios/networks/Renater2006.ned
index e10377f..5ffff12 100644
--- a/scenarios/networks/Renater2006.ned
+++ b/scenarios/networks/Renater2006.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2006_KN.ned b/scenarios/networks/Renater2006_KN.ned
index a652250..aa57fea 100644
--- a/scenarios/networks/Renater2006_KN.ned
+++ b/scenarios/networks/Renater2006_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2008.ned b/scenarios/networks/Renater2008.ned
index 36068c1..336d9d1 100644
--- a/scenarios/networks/Renater2008.ned
+++ b/scenarios/networks/Renater2008.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2008_KN.ned b/scenarios/networks/Renater2008_KN.ned
index 3d270c4..12f8bb8 100644
--- a/scenarios/networks/Renater2008_KN.ned
+++ b/scenarios/networks/Renater2008_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2010.ned b/scenarios/networks/Renater2010.ned
index e022910..6424ac8 100644
--- a/scenarios/networks/Renater2010.ned
+++ b/scenarios/networks/Renater2010.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Renater2010_KN.ned b/scenarios/networks/Renater2010_KN.ned
index f1b189b..0e3bd75 100644
--- a/scenarios/networks/Renater2010_KN.ned
+++ b/scenarios/networks/Renater2010_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Rnp.ned b/scenarios/networks/Rnp.ned
index 8982c4d..d34e131 100644
--- a/scenarios/networks/Rnp.ned
+++ b/scenarios/networks/Rnp.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Rnp_KN.ned b/scenarios/networks/Rnp_KN.ned
index 5d8fc04..2069498 100644
--- a/scenarios/networks/Rnp_KN.ned
+++ b/scenarios/networks/Rnp_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Roedunet.ned b/scenarios/networks/Roedunet.ned
index 2a3aafd..495991e 100644
--- a/scenarios/networks/Roedunet.ned
+++ b/scenarios/networks/Roedunet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Roedunet_KN.ned b/scenarios/networks/Roedunet_KN.ned
index cd6cd39..a0c786b 100644
--- a/scenarios/networks/Roedunet_KN.ned
+++ b/scenarios/networks/Roedunet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Sanet.ned b/scenarios/networks/Sanet.ned
index 840f00e..bdddd7f 100644
--- a/scenarios/networks/Sanet.ned
+++ b/scenarios/networks/Sanet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Sanet_KN.ned b/scenarios/networks/Sanet_KN.ned
index c6a34a2..f2aa97e 100644
--- a/scenarios/networks/Sanet_KN.ned
+++ b/scenarios/networks/Sanet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_DynamicFatTree.ned b/scenarios/networks/Scenario_DynamicFatTree.ned
index 467a402..7c07250 100644
--- a/scenarios/networks/Scenario_DynamicFatTree.ned
+++ b/scenarios/networks/Scenario_DynamicFatTree.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_DynamicFatTree_HF.ned b/scenarios/networks/Scenario_DynamicFatTree_HF.ned
index 06af4c9..b616428 100644
--- a/scenarios/networks/Scenario_DynamicFatTree_HF.ned
+++ b/scenarios/networks/Scenario_DynamicFatTree_HF.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_DynamicFatTree_KN.ned b/scenarios/networks/Scenario_DynamicFatTree_KN.ned
index 56fa55c..c8ff838 100644
--- a/scenarios/networks/Scenario_DynamicFatTree_KN.ned
+++ b/scenarios/networks/Scenario_DynamicFatTree_KN.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_TestCase.ned b/scenarios/networks/Scenario_TestCase.ned
index 3e0ca11..9bbb8a8 100644
--- a/scenarios/networks/Scenario_TestCase.ned
+++ b/scenarios/networks/Scenario_TestCase.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_TestCaseDiamond.ned b/scenarios/networks/Scenario_TestCaseDiamond.ned
index c353e2a..bfca311 100644
--- a/scenarios/networks/Scenario_TestCaseDiamond.ned
+++ b/scenarios/networks/Scenario_TestCaseDiamond.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_TestCaseKandooDiamond.ned b/scenarios/networks/Scenario_TestCaseKandooDiamond.ned
index 616f264..2eb101f 100644
--- a/scenarios/networks/Scenario_TestCaseKandooDiamond.ned
+++ b/scenarios/networks/Scenario_TestCaseKandooDiamond.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_TestCaseKandooSplit.ned b/scenarios/networks/Scenario_TestCaseKandooSplit.ned
index 8625586..1bda1e1 100644
--- a/scenarios/networks/Scenario_TestCaseKandooSplit.ned
+++ b/scenarios/networks/Scenario_TestCaseKandooSplit.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_USA.ned b/scenarios/networks/Scenario_USA.ned
index 6728349..bacb88f 100644
--- a/scenarios/networks/Scenario_USA.ned
+++ b/scenarios/networks/Scenario_USA.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_USA_HF.ned b/scenarios/networks/Scenario_USA_HF.ned
index fc8e697..5787877 100644
--- a/scenarios/networks/Scenario_USA_HF.ned
+++ b/scenarios/networks/Scenario_USA_HF.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Scenario_USA_KN.ned b/scenarios/networks/Scenario_USA_KN.ned
index 9b3260b..f4fdd2c 100644
--- a/scenarios/networks/Scenario_USA_KN.ned
+++ b/scenarios/networks/Scenario_USA_KN.ned
@@ -1,6 +1,6 @@
 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Sunet.ned b/scenarios/networks/Sunet.ned
index 30e54d9..748669e 100644
--- a/scenarios/networks/Sunet.ned
+++ b/scenarios/networks/Sunet.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Sunet_KN.ned b/scenarios/networks/Sunet_KN.ned
index bc85985..890edf9 100644
--- a/scenarios/networks/Sunet_KN.ned
+++ b/scenarios/networks/Sunet_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/SwitchL3.ned b/scenarios/networks/SwitchL3.ned
index 7938eaf..f1a1ae7 100644
--- a/scenarios/networks/SwitchL3.ned
+++ b/scenarios/networks/SwitchL3.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/SwitchL3_KN.ned b/scenarios/networks/SwitchL3_KN.ned
index 649a1a6..71ac330 100644
--- a/scenarios/networks/SwitchL3_KN.ned
+++ b/scenarios/networks/SwitchL3_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Xspedius.ned b/scenarios/networks/Xspedius.ned
index fe12713..e537739 100644
--- a/scenarios/networks/Xspedius.ned
+++ b/scenarios/networks/Xspedius.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/networks/Xspedius_KN.ned b/scenarios/networks/Xspedius_KN.ned
index e138257..be60e22 100644
--- a/scenarios/networks/Xspedius_KN.ned
+++ b/scenarios/networks/Xspedius_KN.ned
@@ -13,7 +13,7 @@
 // along with this program.  If not, see http://www.gnu.org/licenses/.
 // 
 
-package openflow.networks;
+package scenarios.networks;
 
 import inet.common.misc.ThruputMeteringChannel;
 import inet.networklayer.configurator.ipv4.IPv4NetworkConfigurator;
diff --git a/scenarios/package.ned b/scenarios/package.ned
index 6820e13..7a74c3e 100644
--- a/scenarios/package.ned
+++ b/scenarios/package.ned
@@ -1,3 +1,3 @@
-package openflow;
+package scenarios;
 
 @license(LGPL);
diff --git a/scenarios/testcases/Scenario_TestCase_ARPResponder.ini b/scenarios/testcases/Scenario_TestCase_ARPResponder.ini
index 4db0555..ae318dc 100644
--- a/scenarios/testcases/Scenario_TestCase_ARPResponder.ini
+++ b/scenarios/testcases/Scenario_TestCase_ARPResponder.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_BalancedMinHop.ini b/scenarios/testcases/Scenario_TestCase_BalancedMinHop.ini
index 3bd12b3..47e4f2f 100644
--- a/scenarios/testcases/Scenario_TestCase_BalancedMinHop.ini
+++ b/scenarios/testcases/Scenario_TestCase_BalancedMinHop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_Diamond.ini b/scenarios/testcases/Scenario_TestCase_Diamond.ini
index 1c6d167..83f42f0 100644
--- a/scenarios/testcases/Scenario_TestCase_Diamond.ini
+++ b/scenarios/testcases/Scenario_TestCase_Diamond.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCaseDiamond
+network = scenarios.networks.Scenario_TestCaseDiamond
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_Forwarding.ini b/scenarios/testcases/Scenario_TestCase_Forwarding.ini
index fab0e11..2c6f2ca 100644
--- a/scenarios/testcases/Scenario_TestCase_Forwarding.ini
+++ b/scenarios/testcases/Scenario_TestCase_Forwarding.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_Hub.ini b/scenarios/testcases/Scenario_TestCase_Hub.ini
index 9b9c952..59f35e6 100644
--- a/scenarios/testcases/Scenario_TestCase_Hub.ini
+++ b/scenarios/testcases/Scenario_TestCase_Hub.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${configname}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${configname}-${runnumber}.sca
diff --git a/scenarios/testcases/Scenario_TestCase_HyperFlow_ARPResponder.ini b/scenarios/testcases/Scenario_TestCase_HyperFlow_ARPResponder.ini
index f109295..7bce392 100644
--- a/scenarios/testcases/Scenario_TestCase_HyperFlow_ARPResponder.ini
+++ b/scenarios/testcases/Scenario_TestCase_HyperFlow_ARPResponder.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_HyperFlow_Forwarding.ini b/scenarios/testcases/Scenario_TestCase_HyperFlow_Forwarding.ini
index 07da9a9..3db1e96 100644
--- a/scenarios/testcases/Scenario_TestCase_HyperFlow_Forwarding.ini
+++ b/scenarios/testcases/Scenario_TestCase_HyperFlow_Forwarding.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_KandooDiamond.ini b/scenarios/testcases/Scenario_TestCase_KandooDiamond.ini
index e50bb61..b3c7879 100644
--- a/scenarios/testcases/Scenario_TestCase_KandooDiamond.ini
+++ b/scenarios/testcases/Scenario_TestCase_KandooDiamond.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCaseKandooDiamond
+network = scenarios.networks.Scenario_TestCaseKandooDiamond
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_KandooSplit.ini b/scenarios/testcases/Scenario_TestCase_KandooSplit.ini
index 9dd9e43..55320ee 100644
--- a/scenarios/testcases/Scenario_TestCase_KandooSplit.ini
+++ b/scenarios/testcases/Scenario_TestCase_KandooSplit.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCaseKandooSplit
+network = scenarios.networks.Scenario_TestCaseKandooSplit
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_LLDP.ini b/scenarios/testcases/Scenario_TestCase_LLDP.ini
index 729f34d..f31aaeb 100644
--- a/scenarios/testcases/Scenario_TestCase_LLDP.ini
+++ b/scenarios/testcases/Scenario_TestCase_LLDP.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_LearningSwitch.ini b/scenarios/testcases/Scenario_TestCase_LearningSwitch.ini
index 7dbd43a..35cdc9a 100644
--- a/scenarios/testcases/Scenario_TestCase_LearningSwitch.ini
+++ b/scenarios/testcases/Scenario_TestCase_LearningSwitch.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/Scenario_TestCase_TrafficGenerator.ini b/scenarios/testcases/Scenario_TestCase_TrafficGenerator.ini
index 93d40f7..2ac2fca 100644
--- a/scenarios/testcases/Scenario_TestCase_TrafficGenerator.ini
+++ b/scenarios/testcases/Scenario_TestCase_TrafficGenerator.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCase
+network = scenarios.networks.Scenario_TestCase
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/testcases/example.ini b/scenarios/testcases/example.ini
index 1c6d167..83f42f0 100644
--- a/scenarios/testcases/example.ini
+++ b/scenarios/testcases/example.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_TestCaseDiamond
+network = scenarios.networks.Scenario_TestCaseDiamond
 
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/topologyzoo/Agis.ini b/scenarios/topologyzoo/Agis.ini
index cc97527..9cf0c5f 100644
--- a/scenarios/topologyzoo/Agis.ini
+++ b/scenarios/topologyzoo/Agis.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Agis
+network = scenarios.networks.Scenario_Agis
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Agis_KN.ini b/scenarios/topologyzoo/Agis_KN.ini
index bb93915..dd33fc2 100644
--- a/scenarios/topologyzoo/Agis_KN.ini
+++ b/scenarios/topologyzoo/Agis_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Agis_KN
+network = scenarios.networks.Scenario_Agis_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arn.ini b/scenarios/topologyzoo/Arn.ini
index ef2ac90..5b0fcca 100644
--- a/scenarios/topologyzoo/Arn.ini
+++ b/scenarios/topologyzoo/Arn.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Arn
+network = scenarios.networks.Scenario_Arn
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arn_KN.ini b/scenarios/topologyzoo/Arn_KN.ini
index 621976c..7c09c1f 100644
--- a/scenarios/topologyzoo/Arn_KN.ini
+++ b/scenarios/topologyzoo/Arn_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Arn_KN
+network = scenarios.networks.Scenario_Arn_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arnes.ini b/scenarios/topologyzoo/Arnes.ini
index fec3087..1e550d0 100644
--- a/scenarios/topologyzoo/Arnes.ini
+++ b/scenarios/topologyzoo/Arnes.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Arnes
+network = scenarios.networks.Scenario_Arnes
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arnes_KN.ini b/scenarios/topologyzoo/Arnes_KN.ini
index 2c9d0a6..796e05f 100644
--- a/scenarios/topologyzoo/Arnes_KN.ini
+++ b/scenarios/topologyzoo/Arnes_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Arnes_KN
+network = scenarios.networks.Scenario_Arnes_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arpanet19723.ini b/scenarios/topologyzoo/Arpanet19723.ini
index 4de914f..829de16 100644
--- a/scenarios/topologyzoo/Arpanet19723.ini
+++ b/scenarios/topologyzoo/Arpanet19723.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Arpanet19723
+network = scenarios.networks.Scenario_Arpanet19723
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arpanet19723_KN.ini b/scenarios/topologyzoo/Arpanet19723_KN.ini
index e7a46c4..58df0a0 100644
--- a/scenarios/topologyzoo/Arpanet19723_KN.ini
+++ b/scenarios/topologyzoo/Arpanet19723_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Arpanet19723_KN
+network = scenarios.networks.Scenario_Arpanet19723_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arpanet19728.ini b/scenarios/topologyzoo/Arpanet19728.ini
index 947d447..cf886fa 100644
--- a/scenarios/topologyzoo/Arpanet19728.ini
+++ b/scenarios/topologyzoo/Arpanet19728.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.290s
-network = openflow.networks.Scenario_Arpanet19728
+network = scenarios.networks.Scenario_Arpanet19728
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Arpanet19728_KN.ini b/scenarios/topologyzoo/Arpanet19728_KN.ini
index b7a877f..c00a0a1 100644
--- a/scenarios/topologyzoo/Arpanet19728_KN.ini
+++ b/scenarios/topologyzoo/Arpanet19728_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.290s
-network = openflow.networks.Scenario_Arpanet19728_KN
+network = scenarios.networks.Scenario_Arpanet19728_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/AttMpls.ini b/scenarios/topologyzoo/AttMpls.ini
index 92bcc98..d29d368 100644
--- a/scenarios/topologyzoo/AttMpls.ini
+++ b/scenarios/topologyzoo/AttMpls.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_AttMpls
+network = scenarios.networks.Scenario_AttMpls
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/AttMpls_KN.ini b/scenarios/topologyzoo/AttMpls_KN.ini
index 6cd499f..fa3e08c 100644
--- a/scenarios/topologyzoo/AttMpls_KN.ini
+++ b/scenarios/topologyzoo/AttMpls_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_AttMpls_KN
+network = scenarios.networks.Scenario_AttMpls_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bbnplanet.ini b/scenarios/topologyzoo/Bbnplanet.ini
index da5d834..0697934 100644
--- a/scenarios/topologyzoo/Bbnplanet.ini
+++ b/scenarios/topologyzoo/Bbnplanet.ini
@@ -105,7 +105,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Bbnplanet
+network = scenarios.networks.Scenario_Bbnplanet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bbnplanet_KN.ini b/scenarios/topologyzoo/Bbnplanet_KN.ini
index c6eef36..661bf14 100644
--- a/scenarios/topologyzoo/Bbnplanet_KN.ini
+++ b/scenarios/topologyzoo/Bbnplanet_KN.ini
@@ -120,7 +120,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Bbnplanet_KN
+network = scenarios.networks.Scenario_Bbnplanet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/BeyondTheNetwork.ini b/scenarios/topologyzoo/BeyondTheNetwork.ini
index fd11c6e..fd091ba 100644
--- a/scenarios/topologyzoo/BeyondTheNetwork.ini
+++ b/scenarios/topologyzoo/BeyondTheNetwork.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.290s
-network = openflow.networks.Scenario_BeyondTheNetwork
+network = scenarios.networks.Scenario_BeyondTheNetwork
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/BeyondTheNetwork_KN.ini b/scenarios/topologyzoo/BeyondTheNetwork_KN.ini
index ef97f1f..465a310 100644
--- a/scenarios/topologyzoo/BeyondTheNetwork_KN.ini
+++ b/scenarios/topologyzoo/BeyondTheNetwork_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.290s
-network = openflow.networks.Scenario_BeyondTheNetwork_KN
+network = scenarios.networks.Scenario_BeyondTheNetwork_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bics.ini b/scenarios/topologyzoo/Bics.ini
index 7bc64d4..b68516f 100644
--- a/scenarios/topologyzoo/Bics.ini
+++ b/scenarios/topologyzoo/Bics.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_Bics
+network = scenarios.networks.Scenario_Bics
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bics_KN.ini b/scenarios/topologyzoo/Bics_KN.ini
index a7dcb83..4a00f54 100644
--- a/scenarios/topologyzoo/Bics_KN.ini
+++ b/scenarios/topologyzoo/Bics_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_Bics_KN
+network = scenarios.networks.Scenario_Bics_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Biznet.ini b/scenarios/topologyzoo/Biznet.ini
index 883c6b7..d6f0d61 100644
--- a/scenarios/topologyzoo/Biznet.ini
+++ b/scenarios/topologyzoo/Biznet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Biznet
+network = scenarios.networks.Scenario_Biznet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Biznet_KN.ini b/scenarios/topologyzoo/Biznet_KN.ini
index dca60e2..61b6d28 100644
--- a/scenarios/topologyzoo/Biznet_KN.ini
+++ b/scenarios/topologyzoo/Biznet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Biznet_KN
+network = scenarios.networks.Scenario_Biznet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bren.ini b/scenarios/topologyzoo/Bren.ini
index 5442925..e7d1f09 100644
--- a/scenarios/topologyzoo/Bren.ini
+++ b/scenarios/topologyzoo/Bren.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Bren
+network = scenarios.networks.Scenario_Bren
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Bren_KN.ini b/scenarios/topologyzoo/Bren_KN.ini
index 273faf0..6179c34 100644
--- a/scenarios/topologyzoo/Bren_KN.ini
+++ b/scenarios/topologyzoo/Bren_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Bren_KN
+network = scenarios.networks.Scenario_Bren_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/BtNorthAmerica.ini b/scenarios/topologyzoo/BtNorthAmerica.ini
index 6eb0f2d..bf8c9fc 100644
--- a/scenarios/topologyzoo/BtNorthAmerica.ini
+++ b/scenarios/topologyzoo/BtNorthAmerica.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_BtNorthAmerica
+network = scenarios.networks.Scenario_BtNorthAmerica
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/BtNorthAmerica_KN.ini b/scenarios/topologyzoo/BtNorthAmerica_KN.ini
index ff63b7b..fe21126 100644
--- a/scenarios/topologyzoo/BtNorthAmerica_KN.ini
+++ b/scenarios/topologyzoo/BtNorthAmerica_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_BtNorthAmerica_KN
+network = scenarios.networks.Scenario_BtNorthAmerica_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cernet.ini b/scenarios/topologyzoo/Cernet.ini
index 0b44fd8..928d7c2 100644
--- a/scenarios/topologyzoo/Cernet.ini
+++ b/scenarios/topologyzoo/Cernet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Cernet
+network = scenarios.networks.Scenario_Cernet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cernet_KN.ini b/scenarios/topologyzoo/Cernet_KN.ini
index cdc8248..1bff1a4 100644
--- a/scenarios/topologyzoo/Cernet_KN.ini
+++ b/scenarios/topologyzoo/Cernet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Cernet_KN
+network = scenarios.networks.Scenario_Cernet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200304.ini b/scenarios/topologyzoo/Cesnet200304.ini
index 2fa9ee1..a780407 100644
--- a/scenarios/topologyzoo/Cesnet200304.ini
+++ b/scenarios/topologyzoo/Cesnet200304.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Cesnet200304
+network = scenarios.networks.Scenario_Cesnet200304
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200304_KN.ini b/scenarios/topologyzoo/Cesnet200304_KN.ini
index 77409df..d06936a 100644
--- a/scenarios/topologyzoo/Cesnet200304_KN.ini
+++ b/scenarios/topologyzoo/Cesnet200304_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Cesnet200304_KN
+network = scenarios.networks.Scenario_Cesnet200304_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200511.ini b/scenarios/topologyzoo/Cesnet200511.ini
index 2765de9..9195652 100644
--- a/scenarios/topologyzoo/Cesnet200511.ini
+++ b/scenarios/topologyzoo/Cesnet200511.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Cesnet200511
+network = scenarios.networks.Scenario_Cesnet200511
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200511_KN.ini b/scenarios/topologyzoo/Cesnet200511_KN.ini
index e6142a3..65735a8 100644
--- a/scenarios/topologyzoo/Cesnet200511_KN.ini
+++ b/scenarios/topologyzoo/Cesnet200511_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Cesnet200511_KN
+network = scenarios.networks.Scenario_Cesnet200511_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200603.ini b/scenarios/topologyzoo/Cesnet200603.ini
index 549d2ab..d5d0c0d 100644
--- a/scenarios/topologyzoo/Cesnet200603.ini
+++ b/scenarios/topologyzoo/Cesnet200603.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Cesnet200603
+network = scenarios.networks.Scenario_Cesnet200603
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200603_KN.ini b/scenarios/topologyzoo/Cesnet200603_KN.ini
index 35b1613..d116df5 100644
--- a/scenarios/topologyzoo/Cesnet200603_KN.ini
+++ b/scenarios/topologyzoo/Cesnet200603_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Cesnet200603_KN
+network = scenarios.networks.Scenario_Cesnet200603_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200706.ini b/scenarios/topologyzoo/Cesnet200706.ini
index 1305e42..3b9b6d6 100644
--- a/scenarios/topologyzoo/Cesnet200706.ini
+++ b/scenarios/topologyzoo/Cesnet200706.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.380s
-network = openflow.networks.Scenario_Cesnet200706
+network = scenarios.networks.Scenario_Cesnet200706
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Cesnet200706_KN.ini b/scenarios/topologyzoo/Cesnet200706_KN.ini
index 477ad36..f4244fd 100644
--- a/scenarios/topologyzoo/Cesnet200706_KN.ini
+++ b/scenarios/topologyzoo/Cesnet200706_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.380s
-network = openflow.networks.Scenario_Cesnet200706_KN
+network = scenarios.networks.Scenario_Cesnet200706_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Chinanet.ini b/scenarios/topologyzoo/Chinanet.ini
index 08261b4..3a7e155 100644
--- a/scenarios/topologyzoo/Chinanet.ini
+++ b/scenarios/topologyzoo/Chinanet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.380s
-network = openflow.networks.Scenario_Chinanet
+network = scenarios.networks.Scenario_Chinanet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Chinanet_KN.ini b/scenarios/topologyzoo/Chinanet_KN.ini
index 120572a..735ff2e 100644
--- a/scenarios/topologyzoo/Chinanet_KN.ini
+++ b/scenarios/topologyzoo/Chinanet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.380s
-network = openflow.networks.Scenario_Chinanet_KN
+network = scenarios.networks.Scenario_Chinanet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/CrlNetworkServices.ini b/scenarios/topologyzoo/CrlNetworkServices.ini
index 76b4e1d..14a20e4 100644
--- a/scenarios/topologyzoo/CrlNetworkServices.ini
+++ b/scenarios/topologyzoo/CrlNetworkServices.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_CrlNetworkServices
+network = scenarios.networks.Scenario_CrlNetworkServices
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/CrlNetworkServices_KN.ini b/scenarios/topologyzoo/CrlNetworkServices_KN.ini
index 6c5385b..e69b7e2 100644
--- a/scenarios/topologyzoo/CrlNetworkServices_KN.ini
+++ b/scenarios/topologyzoo/CrlNetworkServices_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_CrlNetworkServices_KN
+network = scenarios.networks.Scenario_CrlNetworkServices_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Darkstrand.ini b/scenarios/topologyzoo/Darkstrand.ini
index e616c34..30387e9 100644
--- a/scenarios/topologyzoo/Darkstrand.ini
+++ b/scenarios/topologyzoo/Darkstrand.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Darkstrand
+network = scenarios.networks.Scenario_Darkstrand
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Darkstrand_KN.ini b/scenarios/topologyzoo/Darkstrand_KN.ini
index 99157d5..6d2e211 100644
--- a/scenarios/topologyzoo/Darkstrand_KN.ini
+++ b/scenarios/topologyzoo/Darkstrand_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Darkstrand_KN
+network = scenarios.networks.Scenario_Darkstrand_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Digex.ini b/scenarios/topologyzoo/Digex.ini
index 15b5044..a303fd7 100644
--- a/scenarios/topologyzoo/Digex.ini
+++ b/scenarios/topologyzoo/Digex.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.310s
-network = openflow.networks.Scenario_Digex
+network = scenarios.networks.Scenario_Digex
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Digex_KN.ini b/scenarios/topologyzoo/Digex_KN.ini
index 37f9be8..9a1a8e3 100644
--- a/scenarios/topologyzoo/Digex_KN.ini
+++ b/scenarios/topologyzoo/Digex_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.310s
-network = openflow.networks.Scenario_Digex_KN
+network = scenarios.networks.Scenario_Digex_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Evolink.ini b/scenarios/topologyzoo/Evolink.ini
index b5133a6..4f2fd0d 100644
--- a/scenarios/topologyzoo/Evolink.ini
+++ b/scenarios/topologyzoo/Evolink.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.320s
-network = openflow.networks.Scenario_Evolink
+network = scenarios.networks.Scenario_Evolink
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Evolink_KN.ini b/scenarios/topologyzoo/Evolink_KN.ini
index d504be6..de7ab2c 100644
--- a/scenarios/topologyzoo/Evolink_KN.ini
+++ b/scenarios/topologyzoo/Evolink_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.320s
-network = openflow.networks.Scenario_Evolink_KN
+network = scenarios.networks.Scenario_Evolink_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2001.ini b/scenarios/topologyzoo/Geant2001.ini
index b36b253..c33c0b0 100644
--- a/scenarios/topologyzoo/Geant2001.ini
+++ b/scenarios/topologyzoo/Geant2001.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Geant2001
+network = scenarios.networks.Scenario_Geant2001
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2001_KN.ini b/scenarios/topologyzoo/Geant2001_KN.ini
index 7640123..6c6d96e 100644
--- a/scenarios/topologyzoo/Geant2001_KN.ini
+++ b/scenarios/topologyzoo/Geant2001_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Geant2001_KN
+network = scenarios.networks.Scenario_Geant2001_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2009.ini b/scenarios/topologyzoo/Geant2009.ini
index 5a266bd..8b8da35 100644
--- a/scenarios/topologyzoo/Geant2009.ini
+++ b/scenarios/topologyzoo/Geant2009.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Geant2009
+network = scenarios.networks.Scenario_Geant2009
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2009_KN.ini b/scenarios/topologyzoo/Geant2009_KN.ini
index f99af5a..f7c4fae 100644
--- a/scenarios/topologyzoo/Geant2009_KN.ini
+++ b/scenarios/topologyzoo/Geant2009_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Geant2009_KN
+network = scenarios.networks.Scenario_Geant2009_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2010.ini b/scenarios/topologyzoo/Geant2010.ini
index a6d8b86..2bb2b9f 100644
--- a/scenarios/topologyzoo/Geant2010.ini
+++ b/scenarios/topologyzoo/Geant2010.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Geant2010
+network = scenarios.networks.Scenario_Geant2010
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2010_KN.ini b/scenarios/topologyzoo/Geant2010_KN.ini
index 205226e..023f045 100644
--- a/scenarios/topologyzoo/Geant2010_KN.ini
+++ b/scenarios/topologyzoo/Geant2010_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Geant2010_KN
+network = scenarios.networks.Scenario_Geant2010_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2012.ini b/scenarios/topologyzoo/Geant2012.ini
index 805dd08..5c93ab4 100644
--- a/scenarios/topologyzoo/Geant2012.ini
+++ b/scenarios/topologyzoo/Geant2012.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Geant2012
+network = scenarios.networks.Scenario_Geant2012
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Geant2012_KN.ini b/scenarios/topologyzoo/Geant2012_KN.ini
index e61583f..83f6b00 100644
--- a/scenarios/topologyzoo/Geant2012_KN.ini
+++ b/scenarios/topologyzoo/Geant2012_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Geant2012_KN
+network = scenarios.networks.Scenario_Geant2012_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Grnet.ini b/scenarios/topologyzoo/Grnet.ini
index dde3149..37dce18 100644
--- a/scenarios/topologyzoo/Grnet.ini
+++ b/scenarios/topologyzoo/Grnet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Grnet
+network = scenarios.networks.Scenario_Grnet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Grnet_KN.ini b/scenarios/topologyzoo/Grnet_KN.ini
index 77fdb40..82c4cbd 100644
--- a/scenarios/topologyzoo/Grnet_KN.ini
+++ b/scenarios/topologyzoo/Grnet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Grnet_KN
+network = scenarios.networks.Scenario_Grnet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsCzechRepublic.ini b/scenarios/topologyzoo/GtsCzechRepublic.ini
index e71ee3d..06b557e 100644
--- a/scenarios/topologyzoo/GtsCzechRepublic.ini
+++ b/scenarios/topologyzoo/GtsCzechRepublic.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_GtsCzechRepublic
+network = scenarios.networks.Scenario_GtsCzechRepublic
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsCzechRepublic_KN.ini b/scenarios/topologyzoo/GtsCzechRepublic_KN.ini
index 0db685e..e66d12a 100644
--- a/scenarios/topologyzoo/GtsCzechRepublic_KN.ini
+++ b/scenarios/topologyzoo/GtsCzechRepublic_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_GtsCzechRepublic_KN
+network = scenarios.networks.Scenario_GtsCzechRepublic_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsPoland.ini b/scenarios/topologyzoo/GtsPoland.ini
index 04d26a8..5350855 100644
--- a/scenarios/topologyzoo/GtsPoland.ini
+++ b/scenarios/topologyzoo/GtsPoland.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_GtsPoland
+network = scenarios.networks.Scenario_GtsPoland
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsPoland_KN.ini b/scenarios/topologyzoo/GtsPoland_KN.ini
index dfd3612..87e110a 100644
--- a/scenarios/topologyzoo/GtsPoland_KN.ini
+++ b/scenarios/topologyzoo/GtsPoland_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_GtsPoland_KN
+network = scenarios.networks.Scenario_GtsPoland_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsSlovakia.ini b/scenarios/topologyzoo/GtsSlovakia.ini
index 090bd13..751ae84 100644
--- a/scenarios/topologyzoo/GtsSlovakia.ini
+++ b/scenarios/topologyzoo/GtsSlovakia.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_GtsSlovakia
+network = scenarios.networks.Scenario_GtsSlovakia
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/GtsSlovakia_KN.ini b/scenarios/topologyzoo/GtsSlovakia_KN.ini
index c8f415f..f9ad6ca 100644
--- a/scenarios/topologyzoo/GtsSlovakia_KN.ini
+++ b/scenarios/topologyzoo/GtsSlovakia_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_GtsSlovakia_KN
+network = scenarios.networks.Scenario_GtsSlovakia_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Iij.ini b/scenarios/topologyzoo/Iij.ini
index 76a668f..04967fd 100644
--- a/scenarios/topologyzoo/Iij.ini
+++ b/scenarios/topologyzoo/Iij.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Iij
+network = scenarios.networks.Scenario_Iij
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Iij_KN.ini b/scenarios/topologyzoo/Iij_KN.ini
index 2facf98..be9adca 100644
--- a/scenarios/topologyzoo/Iij_KN.ini
+++ b/scenarios/topologyzoo/Iij_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Iij_KN
+network = scenarios.networks.Scenario_Iij_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Integra.ini b/scenarios/topologyzoo/Integra.ini
index ed56bf7..9824e7f 100644
--- a/scenarios/topologyzoo/Integra.ini
+++ b/scenarios/topologyzoo/Integra.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Integra
+network = scenarios.networks.Scenario_Integra
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Integra_KN.ini b/scenarios/topologyzoo/Integra_KN.ini
index 33b2f7b..2335a23 100644
--- a/scenarios/topologyzoo/Integra_KN.ini
+++ b/scenarios/topologyzoo/Integra_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_Integra_KN
+network = scenarios.networks.Scenario_Integra_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Janetbackbone.ini b/scenarios/topologyzoo/Janetbackbone.ini
index 6543021..40a5d75 100644
--- a/scenarios/topologyzoo/Janetbackbone.ini
+++ b/scenarios/topologyzoo/Janetbackbone.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Janetbackbone
+network = scenarios.networks.Scenario_Janetbackbone
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Janetbackbone_KN.ini b/scenarios/topologyzoo/Janetbackbone_KN.ini
index c00fb1d..59fcfb3 100644
--- a/scenarios/topologyzoo/Janetbackbone_KN.ini
+++ b/scenarios/topologyzoo/Janetbackbone_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Janetbackbone_KN
+network = scenarios.networks.Scenario_Janetbackbone_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/KentmanFeb2008.ini b/scenarios/topologyzoo/KentmanFeb2008.ini
index e611824..473c8bc 100644
--- a/scenarios/topologyzoo/KentmanFeb2008.ini
+++ b/scenarios/topologyzoo/KentmanFeb2008.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_KentmanFeb2008
+network = scenarios.networks.Scenario_KentmanFeb2008
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/KentmanFeb2008_KN.ini b/scenarios/topologyzoo/KentmanFeb2008_KN.ini
index 14e6216..8aa62af 100644
--- a/scenarios/topologyzoo/KentmanFeb2008_KN.ini
+++ b/scenarios/topologyzoo/KentmanFeb2008_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_KentmanFeb2008_KN
+network = scenarios.networks.Scenario_KentmanFeb2008_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/KentmanJan2011.ini b/scenarios/topologyzoo/KentmanJan2011.ini
index 67ece19..d45046a 100644
--- a/scenarios/topologyzoo/KentmanJan2011.ini
+++ b/scenarios/topologyzoo/KentmanJan2011.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_KentmanJan2011
+network = scenarios.networks.Scenario_KentmanJan2011
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/KentmanJan2011_KN.ini b/scenarios/topologyzoo/KentmanJan2011_KN.ini
index 9d45786..3df9d3b 100644
--- a/scenarios/topologyzoo/KentmanJan2011_KN.ini
+++ b/scenarios/topologyzoo/KentmanJan2011_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_KentmanJan2011_KN
+network = scenarios.networks.Scenario_KentmanJan2011_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/LambdaNet.ini b/scenarios/topologyzoo/LambdaNet.ini
index 0ac0263..01b65e6 100644
--- a/scenarios/topologyzoo/LambdaNet.ini
+++ b/scenarios/topologyzoo/LambdaNet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.320s
-network = openflow.networks.Scenario_LambdaNet
+network = scenarios.networks.Scenario_LambdaNet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/LambdaNet_KN.ini b/scenarios/topologyzoo/LambdaNet_KN.ini
index c32e898..1730ba1 100644
--- a/scenarios/topologyzoo/LambdaNet_KN.ini
+++ b/scenarios/topologyzoo/LambdaNet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.320s
-network = openflow.networks.Scenario_LambdaNet_KN
+network = scenarios.networks.Scenario_LambdaNet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Litnet.ini b/scenarios/topologyzoo/Litnet.ini
index 24c32af..0617746 100644
--- a/scenarios/topologyzoo/Litnet.ini
+++ b/scenarios/topologyzoo/Litnet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.390s
-network = openflow.networks.Scenario_Litnet
+network = scenarios.networks.Scenario_Litnet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Litnet_KN.ini b/scenarios/topologyzoo/Litnet_KN.ini
index e4b6b6d..76d1877 100644
--- a/scenarios/topologyzoo/Litnet_KN.ini
+++ b/scenarios/topologyzoo/Litnet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.390s
-network = openflow.networks.Scenario_Litnet_KN
+network = scenarios.networks.Scenario_Litnet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/NetworkUsa.ini b/scenarios/topologyzoo/NetworkUsa.ini
index 0421759..5cf7d96 100644
--- a/scenarios/topologyzoo/NetworkUsa.ini
+++ b/scenarios/topologyzoo/NetworkUsa.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.350s
-network = openflow.networks.Scenario_NetworkUsa
+network = scenarios.networks.Scenario_NetworkUsa
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/NetworkUsa_KN.ini b/scenarios/topologyzoo/NetworkUsa_KN.ini
index 8870205..1f568d8 100644
--- a/scenarios/topologyzoo/NetworkUsa_KN.ini
+++ b/scenarios/topologyzoo/NetworkUsa_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.350s
-network = openflow.networks.Scenario_NetworkUsa_KN
+network = scenarios.networks.Scenario_NetworkUsa_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Niif.ini b/scenarios/topologyzoo/Niif.ini
index 52320bf..12a8845 100644
--- a/scenarios/topologyzoo/Niif.ini
+++ b/scenarios/topologyzoo/Niif.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.350s
-network = openflow.networks.Scenario_Niif
+network = scenarios.networks.Scenario_Niif
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Niif_KN.ini b/scenarios/topologyzoo/Niif_KN.ini
index 3ad32f2..a88afa9 100644
--- a/scenarios/topologyzoo/Niif_KN.ini
+++ b/scenarios/topologyzoo/Niif_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.350s
-network = openflow.networks.Scenario_Niif_KN
+network = scenarios.networks.Scenario_Niif_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/PionierL3.ini b/scenarios/topologyzoo/PionierL3.ini
index 0cb59c1..7451f4d 100644
--- a/scenarios/topologyzoo/PionierL3.ini
+++ b/scenarios/topologyzoo/PionierL3.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_PionierL3
+network = scenarios.networks.Scenario_PionierL3
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/PionierL3_KN.ini b/scenarios/topologyzoo/PionierL3_KN.ini
index f96ab80..2069686 100644
--- a/scenarios/topologyzoo/PionierL3_KN.ini
+++ b/scenarios/topologyzoo/PionierL3_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.270s
-network = openflow.networks.Scenario_PionierL3_KN
+network = scenarios.networks.Scenario_PionierL3_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2006.ini b/scenarios/topologyzoo/Renater2006.ini
index 3ce1c66..d347151 100644
--- a/scenarios/topologyzoo/Renater2006.ini
+++ b/scenarios/topologyzoo/Renater2006.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Renater2006
+network = scenarios.networks.Scenario_Renater2006
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2006_KN.ini b/scenarios/topologyzoo/Renater2006_KN.ini
index 20ecc0b..607e732 100644
--- a/scenarios/topologyzoo/Renater2006_KN.ini
+++ b/scenarios/topologyzoo/Renater2006_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Renater2006_KN
+network = scenarios.networks.Scenario_Renater2006_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2008.ini b/scenarios/topologyzoo/Renater2008.ini
index de120af..46fa838 100644
--- a/scenarios/topologyzoo/Renater2008.ini
+++ b/scenarios/topologyzoo/Renater2008.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Renater2008
+network = scenarios.networks.Scenario_Renater2008
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2008_KN.ini b/scenarios/topologyzoo/Renater2008_KN.ini
index 4bc4444..3d999b3 100644
--- a/scenarios/topologyzoo/Renater2008_KN.ini
+++ b/scenarios/topologyzoo/Renater2008_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.260s
-network = openflow.networks.Scenario_Renater2008_KN
+network = scenarios.networks.Scenario_Renater2008_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2010.ini b/scenarios/topologyzoo/Renater2010.ini
index 122d55a..00dc530 100644
--- a/scenarios/topologyzoo/Renater2010.ini
+++ b/scenarios/topologyzoo/Renater2010.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Renater2010
+network = scenarios.networks.Scenario_Renater2010
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Renater2010_KN.ini b/scenarios/topologyzoo/Renater2010_KN.ini
index 5a69ab5..35ee59d 100644
--- a/scenarios/topologyzoo/Renater2010_KN.ini
+++ b/scenarios/topologyzoo/Renater2010_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.370s
-network = openflow.networks.Scenario_Renater2010_KN
+network = scenarios.networks.Scenario_Renater2010_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Rnp.ini b/scenarios/topologyzoo/Rnp.ini
index 636d442..b85c4f3 100644
--- a/scenarios/topologyzoo/Rnp.ini
+++ b/scenarios/topologyzoo/Rnp.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Rnp
+network = scenarios.networks.Scenario_Rnp
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Rnp_KN.ini b/scenarios/topologyzoo/Rnp_KN.ini
index 85aad11..6526d45 100644
--- a/scenarios/topologyzoo/Rnp_KN.ini
+++ b/scenarios/topologyzoo/Rnp_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.280s
-network = openflow.networks.Scenario_Rnp_KN
+network = scenarios.networks.Scenario_Rnp_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Roedunet.ini b/scenarios/topologyzoo/Roedunet.ini
index 420aba4..018027c 100644
--- a/scenarios/topologyzoo/Roedunet.ini
+++ b/scenarios/topologyzoo/Roedunet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.400s
-network = openflow.networks.Scenario_Roedunet
+network = scenarios.networks.Scenario_Roedunet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Roedunet_KN.ini b/scenarios/topologyzoo/Roedunet_KN.ini
index 5eb774a..2ed62ab 100644
--- a/scenarios/topologyzoo/Roedunet_KN.ini
+++ b/scenarios/topologyzoo/Roedunet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.400s
-network = openflow.networks.Scenario_Roedunet_KN
+network = scenarios.networks.Scenario_Roedunet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Sanet.ini b/scenarios/topologyzoo/Sanet.ini
index d7d327b..8b3680c 100644
--- a/scenarios/topologyzoo/Sanet.ini
+++ b/scenarios/topologyzoo/Sanet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_Sanet
+network = scenarios.networks.Scenario_Sanet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Sanet_KN.ini b/scenarios/topologyzoo/Sanet_KN.ini
index 5ea6417..62f0ce6 100644
--- a/scenarios/topologyzoo/Sanet_KN.ini
+++ b/scenarios/topologyzoo/Sanet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.330s
-network = openflow.networks.Scenario_Sanet_KN
+network = scenarios.networks.Scenario_Sanet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Sunet.ini b/scenarios/topologyzoo/Sunet.ini
index f034a9f..79fefbc 100644
--- a/scenarios/topologyzoo/Sunet.ini
+++ b/scenarios/topologyzoo/Sunet.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Sunet
+network = scenarios.networks.Scenario_Sunet
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Sunet_KN.ini b/scenarios/topologyzoo/Sunet_KN.ini
index fea5c71..ebc7ed1 100644
--- a/scenarios/topologyzoo/Sunet_KN.ini
+++ b/scenarios/topologyzoo/Sunet_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.250s
-network = openflow.networks.Scenario_Sunet_KN
+network = scenarios.networks.Scenario_Sunet_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/SwitchL3.ini b/scenarios/topologyzoo/SwitchL3.ini
index 01b729d..830cf9d 100644
--- a/scenarios/topologyzoo/SwitchL3.ini
+++ b/scenarios/topologyzoo/SwitchL3.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.300s
-network = openflow.networks.Scenario_SwitchL3
+network = scenarios.networks.Scenario_SwitchL3
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/SwitchL3_KN.ini b/scenarios/topologyzoo/SwitchL3_KN.ini
index 22d9d5a..8d6f09f 100644
--- a/scenarios/topologyzoo/SwitchL3_KN.ini
+++ b/scenarios/topologyzoo/SwitchL3_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.300s
-network = openflow.networks.Scenario_SwitchL3_KN
+network = scenarios.networks.Scenario_SwitchL3_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Xspedius.ini b/scenarios/topologyzoo/Xspedius.ini
index dd752c1..5d7859f 100644
--- a/scenarios/topologyzoo/Xspedius.ini
+++ b/scenarios/topologyzoo/Xspedius.ini
@@ -103,7 +103,7 @@ seed-set = ${repetition}
 #linux mint 15 std value
 **.arp.cacheTimeout = 60s
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Xspedius
+network = scenarios.networks.Scenario_Xspedius
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/topologyzoo/Xspedius_KN.ini b/scenarios/topologyzoo/Xspedius_KN.ini
index cc17d55..0f8c84e 100644
--- a/scenarios/topologyzoo/Xspedius_KN.ini
+++ b/scenarios/topologyzoo/Xspedius_KN.ini
@@ -118,7 +118,7 @@ seed-set = ${repetition}
 **.root*.tcpControllerApps[0].serviceTime=0.000005556s * (${knRFaktor= 1200 !cstFaktor})
 **.root*.tcpControllerApps[0].isRootController = true
 **.client[*].pingApp[*].sendInterval = 0.340s
-network = openflow.networks.Scenario_Xspedius_KN
+network = scenarios.networks.Scenario_Xspedius_KN
 [Config cfg1]
 **.placementID = 1
 **.numControllers = 2
diff --git a/scenarios/usa/.qtenvrc b/scenarios/usa/.qtenvrc
new file mode 100644
index 0000000..0dc0751
--- /dev/null
+++ b/scenarios/usa/.qtenvrc
@@ -0,0 +1,15 @@
+[General]
+last-configname=General
+last-runnumber=0
+
+[RunModeProfiles]
+fast-max-animation-speed=nan
+fast-max-playback-speed=1e+06
+fast-min-animation-speed=nan
+fast-min-playback-speed=1
+fast-playback-speed=1000
+run-max-animation-speed=nan
+run-max-playback-speed=100
+run-min-animation-speed=nan
+run-min-playback-speed=0.01
+run-playback-speed=1
diff --git a/scenarios/usa/Scenario_USA_ARP_Ping_Drop.ini b/scenarios/usa/Scenario_USA_ARP_Ping_Drop.ini
index ed59974..d5caee2 100644
--- a/scenarios/usa/Scenario_USA_ARP_Ping_Drop.ini
+++ b/scenarios/usa/Scenario_USA_ARP_Ping_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Clients_Packets.ini b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Clients_Packets.ini
index bac1676..89a2922 100644
--- a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Clients_Packets.ini
+++ b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Clients_Packets.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load.ini b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load.ini
index 9c402b8..1201164 100644
--- a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load.ini
+++ b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load_Refined.ini b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load_Refined.ini
index c5d5767..81d42b1 100644
--- a/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load_Refined.ini
+++ b/scenarios/usa/Scenario_USA_ARP_Ping_Drop_Load_Refined.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_ARP_Traffic_Drop.ini b/scenarios/usa/Scenario_USA_ARP_Traffic_Drop.ini
index 1949723..63f1136 100644
--- a/scenarios/usa/Scenario_USA_ARP_Traffic_Drop.ini
+++ b/scenarios/usa/Scenario_USA_ARP_Traffic_Drop.ini
@@ -1,6 +1,6 @@
 [General]
 debug-on-errors = true
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/usa/Scenario_USA_Ping_Drop.ini b/scenarios/usa/Scenario_USA_Ping_Drop.ini
index f2a42be..cca6b2d 100644
--- a/scenarios/usa/Scenario_USA_Ping_Drop.ini
+++ b/scenarios/usa/Scenario_USA_Ping_Drop.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_Ping_Drop_Clients_Packets.ini b/scenarios/usa/Scenario_USA_Ping_Drop_Clients_Packets.ini
index 56ec543..d23c93b 100644
--- a/scenarios/usa/Scenario_USA_Ping_Drop_Clients_Packets.ini
+++ b/scenarios/usa/Scenario_USA_Ping_Drop_Clients_Packets.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 debug-on-errors = true
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
diff --git a/scenarios/usa/Scenario_USA_Ping_Flood.ini b/scenarios/usa/Scenario_USA_Ping_Flood.ini
index 8b02344..9d380f0 100644
--- a/scenarios/usa/Scenario_USA_Ping_Flood.ini
+++ b/scenarios/usa/Scenario_USA_Ping_Flood.ini
@@ -1,5 +1,5 @@
 [General]
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/usa/Scenario_USA_Traffic_Drop.ini b/scenarios/usa/Scenario_USA_Traffic_Drop.ini
index da78a20..3a06815 100644
--- a/scenarios/usa/Scenario_USA_Traffic_Drop.ini
+++ b/scenarios/usa/Scenario_USA_Traffic_Drop.ini
@@ -1,6 +1,6 @@
 [General]
 debug-on-errors = true
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/usa/Scenario_USA_Traffic_Flood.ini b/scenarios/usa/Scenario_USA_Traffic_Flood.ini
index 15d2e92..eb11c5e 100644
--- a/scenarios/usa/Scenario_USA_Traffic_Flood.ini
+++ b/scenarios/usa/Scenario_USA_Traffic_Flood.ini
@@ -1,6 +1,6 @@
 [General]
 debug-on-errors = true
-network = openflow.networks.Scenario_USA
+network = scenarios.networks.Scenario_USA
 
 output-vector-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.vec
 output-scalar-file = ${resultdir}/${inifile}/${inifile}-${runnumber}.sca
diff --git a/scenarios/usa/ipv4config.xml b/scenarios/usa/ipv4config.xml
new file mode 100644
index 0000000..cd290a2
--- /dev/null
+++ b/scenarios/usa/ipv4config.xml
@@ -0,0 +1,5 @@
+<config>
+  <interface hosts='**.client*' names='eth0' address='192.168.x.x' netmask='255.255.x.x'/> <!-- data plane -->
+  <interface hosts='**' names='eth0' address='10.x.x.x' netmask='255.x.x.x'/> <!-- control plane -->
+  <route hosts='**' interface='eth0' destination='*'/>
+</config>
\ No newline at end of file
diff --git a/src/openflow/controllerApps/ARPResponder.cc b/src/openflow/controllerApps/ARPResponder.cc
index e00f0e6..1705d07 100644
--- a/src/openflow/controllerApps/ARPResponder.cc
+++ b/src/openflow/controllerApps/ARPResponder.cc
@@ -59,8 +59,8 @@ void ARPResponder::handlePacketIn(OFP_Packet_In * packet_in_msg){
 
                     //encap the arp reply
                     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-                    packetOut->getHeader().version = OFP_VERSION;
-                    packetOut->getHeader().type = OFPT_PACKET_OUT;
+                    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+                    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
                     packetOut->setBuffer_id(OFP_NO_BUFFER);
                     packetOut->setByteLength(24);
                     packetOut->encapsulate(createArpReply(headerFields.arp_dst_adr,headerFields.arp_src_adr,ipToMac[headerFields.arp_dst_adr.str()],headerFields.src_mac));
diff --git a/src/openflow/controllerApps/ARPResponder.h b/src/openflow/controllerApps/ARPResponder.h
index 68cc86d..3046b5a 100644
--- a/src/openflow/controllerApps/ARPResponder.h
+++ b/src/openflow/controllerApps/ARPResponder.h
@@ -9,7 +9,7 @@
 #include "openflow/messages/OFP_Features_Reply_m.h"
 #include "openflow/messages/OFP_Packet_In_m.h"
 #include "inet/networklayer/arp/ipv4/ARPPacket_m.h"
-
+#include "inet/linklayer/ethernet/EtherFrame_m.h"
 
 class ARPResponder:public AbstractControllerApp {
 
diff --git a/src/openflow/controllerApps/AbstractControllerApp.cc b/src/openflow/controllerApps/AbstractControllerApp.cc
index e51d677..652fee0 100644
--- a/src/openflow/controllerApps/AbstractControllerApp.cc
+++ b/src/openflow/controllerApps/AbstractControllerApp.cc
@@ -94,8 +94,8 @@ void AbstractControllerApp::finish(){
 
 OFP_Flow_Mod * AbstractControllerApp::createFlowMod(ofp_flow_mod_command mod_com,const oxm_basic_match  &match, uint32_t outport, int idleTimeOut =1 , int hardTimeOut=0){
     OFP_Flow_Mod *flow_mod_msg = new OFP_Flow_Mod("flow_mod");
-    flow_mod_msg->getHeader().version = OFP_VERSION;
-    flow_mod_msg->getHeader().type = OFPT_FLOW_MOD;
+    flow_mod_msg->getHeaderForUpdate().version = OFP_VERSION;
+    flow_mod_msg->getHeaderForUpdate().type = OFPT_FLOW_MOD;
     flow_mod_msg->setCommand(mod_com);
     flow_mod_msg->setMatch(match);
     flow_mod_msg->setByteLength(56);
@@ -114,8 +114,8 @@ OFP_Flow_Mod * AbstractControllerApp::createFlowMod(ofp_flow_mod_command mod_com
 
 OFP_Packet_Out * AbstractControllerApp::createPacketOutFromPacketIn(OFP_Packet_In *packet_in_msg, uint32_t outport){
     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-    packetOut->getHeader().version = OFP_VERSION;
-    packetOut->getHeader().type = OFPT_PACKET_OUT;
+    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
     packetOut->setBuffer_id(packet_in_msg->getBuffer_id());
     packetOut->setByteLength(24);
 
@@ -141,8 +141,8 @@ OFP_Packet_Out * AbstractControllerApp::createPacketOutFromPacketIn(OFP_Packet_I
 
 OFP_Packet_Out * AbstractControllerApp::createFloodPacketFromPacketIn(OFP_Packet_In *packet_in_msg){
     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-    packetOut->getHeader().version = OFP_VERSION;
-    packetOut->getHeader().type = OFPT_PACKET_OUT;
+    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
     packetOut->setBuffer_id(packet_in_msg->getBuffer_id());
     packetOut->setByteLength(24);
 
@@ -166,8 +166,8 @@ OFP_Packet_Out * AbstractControllerApp::createFloodPacketFromPacketIn(OFP_Packet
 
 OFP_Packet_Out * AbstractControllerApp::createDropPacketFromPacketIn(OFP_Packet_In *packet_in_msg){
     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-    packetOut->getHeader().version = OFP_VERSION;
-    packetOut->getHeader().type = OFPT_PACKET_OUT;
+    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
     packetOut->setBuffer_id(packet_in_msg->getBuffer_id());
     packetOut->setByteLength(24);
 
diff --git a/src/openflow/controllerApps/LLDPAgent.cc b/src/openflow/controllerApps/LLDPAgent.cc
index 89ea3ef..d408ee6 100644
--- a/src/openflow/controllerApps/LLDPAgent.cc
+++ b/src/openflow/controllerApps/LLDPAgent.cc
@@ -77,8 +77,8 @@ void LLDPAgent::sendLLDP(){
 
             //create packet out*/
             OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-            packetOut->getHeader().version = OFP_VERSION;
-            packetOut->getHeader().type = OFPT_PACKET_OUT;
+            packetOut->getHeaderForUpdate().version = OFP_VERSION;
+            packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
             packetOut->setBuffer_id(OFP_NO_BUFFER);
             packetOut->setByteLength(24);
             packetOut->encapsulate(frame);
diff --git a/src/openflow/hyperflow/HF_ARPResponder.cc b/src/openflow/hyperflow/HF_ARPResponder.cc
index f1a756f..89e2347 100644
--- a/src/openflow/hyperflow/HF_ARPResponder.cc
+++ b/src/openflow/hyperflow/HF_ARPResponder.cc
@@ -87,8 +87,8 @@ void HF_ARPResponder::handlePacketIn(OFP_Packet_In * packet_in_msg){
 
                     //encap the arp reply
                     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-                    packetOut->getHeader().version = OFP_VERSION;
-                    packetOut->getHeader().type = OFPT_PACKET_OUT;
+                    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+                    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
                     packetOut->setBuffer_id(OFP_NO_BUFFER);
                     packetOut->setByteLength(24);
                     packetOut->encapsulate(frame);
diff --git a/src/openflow/hyperflow/HyperFlowAgent.cc b/src/openflow/hyperflow/HyperFlowAgent.cc
index 21f3d17..8eaa3b9 100644
--- a/src/openflow/hyperflow/HyperFlowAgent.cc
+++ b/src/openflow/hyperflow/HyperFlowAgent.cc
@@ -125,7 +125,7 @@ void HyperFlowAgent::sendReportIn(){
     //copy switches list
     auto tempList = controller->getSwitchesList();
     for(auto iterSw=tempList->begin();iterSw!=tempList->end();++iterSw){
-        reportIn->getSwitchInfoList().push_front(&(*iterSw));
+        reportIn->getSwitchInfoListForUpdate().push_front(&(*iterSw));
     }
 
     reportIn->setByteLength(1+sizeof(reportIn->getSwitchInfoList()));
diff --git a/src/openflow/hyperflow/HyperFlowSynchronizer.cc b/src/openflow/hyperflow/HyperFlowSynchronizer.cc
index 99483d8..67cf02d 100644
--- a/src/openflow/hyperflow/HyperFlowSynchronizer.cc
+++ b/src/openflow/hyperflow/HyperFlowSynchronizer.cc
@@ -102,7 +102,7 @@ void HyperFlowSynchronizer::handleSyncRequest(HF_SyncRequest * msg){
             iterControl--;
         }
     }
-    reply->getControlChannel().insert(reply->getControlChannel().end(), tempControlChannel.begin(), tempControlChannel.end());
+    reply->getControlChannelForUpdate().insert(reply->getControlChannel().end(), tempControlChannel.begin(), tempControlChannel.end());
 
     //copy only the relevant parts of the datachannel
     std::list<DataChannelEntry> tempDataChannel = std::list<DataChannelEntry>();
diff --git a/src/openflow/kandoo/KN_ARPResponder.cc b/src/openflow/kandoo/KN_ARPResponder.cc
index 6be932b..a67347d 100644
--- a/src/openflow/kandoo/KN_ARPResponder.cc
+++ b/src/openflow/kandoo/KN_ARPResponder.cc
@@ -67,8 +67,8 @@ void KN_ARPResponder::handlePacketIn(OFP_Packet_In * packet_in_msg){
 
                     //encap the arp reply
                     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-                    packetOut->getHeader().version = OFP_VERSION;
-                    packetOut->getHeader().type = OFPT_PACKET_OUT;
+                    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+                    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
                     packetOut->setBuffer_id(OFP_NO_BUFFER);
                     packetOut->setByteLength(24);
                     packetOut->encapsulate(createArpReply(headerFields.arp_dst_adr,headerFields.arp_src_adr,ipToMac[headerFields.arp_dst_adr.str()],headerFields.src_mac));
@@ -164,8 +164,8 @@ void KN_ARPResponder::receiveSignal(cComponent *src, simsignal_t id, cObject *ob
 
                                     //encap the arp reply
                                     OFP_Packet_Out *packetOut = new OFP_Packet_Out("packetOut");
-                                    packetOut->getHeader().version = OFP_VERSION;
-                                    packetOut->getHeader().type = OFPT_PACKET_OUT;
+                                    packetOut->getHeaderForUpdate().version = OFP_VERSION;
+                                    packetOut->getHeaderForUpdate().type = OFPT_PACKET_OUT;
                                     packetOut->setBuffer_id(OFP_NO_BUFFER);
                                     packetOut->setByteLength(24);
                                     packetOut->encapsulate(createArpReply(headerFields.arp_dst_adr,headerFields.arp_src_adr,ipToMac[headerFields.arp_dst_adr.str()],headerFields.src_mac));
diff --git a/src/openflow/messages/HF_ChangeNotification.msg b/src/openflow/messages/HF_ChangeNotification.msg
index c474091..b21ebb0 100644
--- a/src/openflow/messages/HF_ChangeNotification.msg
+++ b/src/openflow/messages/HF_ChangeNotification.msg
@@ -5,7 +5,11 @@ cplusplus {{
     
 }};
 
-struct DataChannelEntry;
+class DataChannelEntry
+{
+    @existingClass;
+    @opaque;
+}
 
 // When packets are received by the data plane and sent to the connected controller,
 // the OFP_PACKET_IN messages are used. If the complete packet needs to be sent to the controller, because it can not be
diff --git a/src/openflow/messages/HF_ReportIn.msg b/src/openflow/messages/HF_ReportIn.msg
index 5fea8c7..db96804 100644
--- a/src/openflow/messages/HF_ReportIn.msg
+++ b/src/openflow/messages/HF_ReportIn.msg
@@ -7,7 +7,14 @@ cplusplus {{
 }};
 
 
-class noncobject SwitchInfoList;   
+//class noncobject SwitchInfoList;
+
+class SwitchInfoList
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
 
 // When packets are received by the data plane and sent to the connected controller,
 // the OFP_PACKET_IN messages are used. If the complete packet needs to be sent to the controller, because it can not be
diff --git a/src/openflow/messages/HF_SyncReply.msg b/src/openflow/messages/HF_SyncReply.msg
index b27a533..cbd8c87 100644
--- a/src/openflow/messages/HF_SyncReply.msg
+++ b/src/openflow/messages/HF_SyncReply.msg
@@ -7,8 +7,23 @@ cplusplus {{
     
 }};
 
-class noncobject ControlChannel;
-class noncobject DataChannel;   
+//class noncobject ControlChannel;
+//class noncobject DataChannel;
+
+class ControlChannel
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
+
+class DataChannel
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
+
 
 // When packets are received by the data plane and sent to the connected controller,
 // the OFP_PACKET_IN messages are used. If the complete packet needs to be sent to the controller, because it can not be
diff --git a/src/openflow/messages/KN_Packet.msg b/src/openflow/messages/KN_Packet.msg
index d015a03..86df64e 100644
--- a/src/openflow/messages/KN_Packet.msg
+++ b/src/openflow/messages/KN_Packet.msg
@@ -4,7 +4,14 @@ cplusplus {{
     #include "openflow/utility/KandooStructs.h"
 }};
   
-struct KandooEntry;
+//struct KandooEntry;
+
+class KandooEntry
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
 
 // When packets are received by the data plane and sent to the connected controller,
 // the OFP_PACKET_IN messages are used. If the complete packet needs to be sent to the controller, because it can not be
diff --git a/src/openflow/messages/OFP_Features_Reply.msg b/src/openflow/messages/OFP_Features_Reply.msg
index a2de4b6..f34a18a 100644
--- a/src/openflow/messages/OFP_Features_Reply.msg
+++ b/src/openflow/messages/OFP_Features_Reply.msg
@@ -1,13 +1,20 @@
 
-
+import openflow.messages.Open_Flow_Message;
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
+ //   #include "openflow/messages/Open_Flow_Message_m.h"
     #include "inet/linklayer/common/MACAddress.h"
 }};
 
-class MACAddress extends void;
-packet Open_Flow_Message;
+class MACAddress
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
+
+//class MACAddress extends void;
+//packet Open_Flow_Message;
 
 // response  to an OFP_Features_Request message
 packet OFP_Features_Reply extends Open_Flow_Message
diff --git a/src/openflow/messages/OFP_Features_Request.msg b/src/openflow/messages/OFP_Features_Request.msg
index d8353e1..6ae4a93 100644
--- a/src/openflow/messages/OFP_Features_Request.msg
+++ b/src/openflow/messages/OFP_Features_Request.msg
@@ -1,12 +1,12 @@
-
+import openflow.messages.Open_Flow_Message;
 
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
+ //   #include "openflow/messages/Open_Flow_Message_m.h"
 }};
 
 
-packet Open_Flow_Message;
+//packet Open_Flow_Message;
 
 
 //Upon session establishment, the controller sends an OFP Features Request message
diff --git a/src/openflow/messages/OFP_Flow_Mod.msg b/src/openflow/messages/OFP_Flow_Mod.msg
index 9741ade..ad38940 100644
--- a/src/openflow/messages/OFP_Flow_Mod.msg
+++ b/src/openflow/messages/OFP_Flow_Mod.msg
@@ -1,13 +1,27 @@
-
+import openflow.messages.Open_Flow_Message;
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
+//    #include "openflow/messages/Open_Flow_Message_m.h"
 }};
 
+class oxm_basic_match
+{
+    @existingClass;
+    @opaque;
+ //   @toString(.str());
+}
+
+class ofp_action_output
+{
+    @existingClass;
+    @opaque;
+ //   @toString(.str());
+}
+  
 
-struct oxm_basic_match;
-struct ofp_action_output;
-packet Open_Flow_Message;
+//struct oxm_basic_match;
+//struct ofp_action_output;
+//packet Open_Flow_Message;
 
 // Modifications to a flow table by the controller.
 packet OFP_Flow_Mod extends Open_Flow_Message
diff --git a/src/openflow/messages/OFP_Hello.msg b/src/openflow/messages/OFP_Hello.msg
index 3067cf9..d1d5331 100644
--- a/src/openflow/messages/OFP_Hello.msg
+++ b/src/openflow/messages/OFP_Hello.msg
@@ -1,12 +1,12 @@
-
+import openflow.messages.Open_Flow_Message;
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"    
+//    #include "openflow/messages/Open_Flow_Message_m.h"    
     
 }};
 
 //struct ofp_action_header;
-packet Open_Flow_Message;
+//packet Open_Flow_Message;
 
 
 packet OFP_Hello extends Open_Flow_Message
diff --git a/src/openflow/messages/OFP_Initialize_Handshake.msg b/src/openflow/messages/OFP_Initialize_Handshake.msg
index d97b1d1..267904e 100644
--- a/src/openflow/messages/OFP_Initialize_Handshake.msg
+++ b/src/openflow/messages/OFP_Initialize_Handshake.msg
@@ -1,12 +1,12 @@
 
-
+import openflow.messages.Open_Flow_Message;
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
+//    #include "openflow/messages/Open_Flow_Message_m.h"
 }};
 
 
-packet Open_Flow_Message;
+//packet Open_Flow_Message;
 
 
 //Upon session establishment, the controller sends an OFP Features Request message
diff --git a/src/openflow/messages/OFP_Packet_In.msg b/src/openflow/messages/OFP_Packet_In.msg
index 64859f6..46c1627 100644
--- a/src/openflow/messages/OFP_Packet_In.msg
+++ b/src/openflow/messages/OFP_Packet_In.msg
@@ -1,9 +1,9 @@
-
+import openflow.messages.Open_Flow_Message;
 
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
-    #include "inet/linklayer/ethernet/EtherFrame_m.h"
+//    #include "openflow/messages/Open_Flow_Message_m.h"
+   #include "inet/linklayer/ethernet/EtherFrame_m.h"
     
     
     inline std::ostream& operator<<(std::ostream& os, oxm_basic_match match)
@@ -17,11 +17,20 @@ cplusplus {{
 	}
 }};
 
-struct ofp_header;
+class oxm_basic_match
+{
+    @existingClass;
+    @opaque;
+ //   @toString(.str());
+}
+
+
+
+//struct ofp_header;
 //class EthernetIIFrame;
-struct oxm_basic_match;
-struct oxm_tlv;
-packet Open_Flow_Message;
+//struct oxm_basic_match;
+//struct oxm_tlv;
+//packet Open_Flow_Message;
 
 // When packets are received by the data plane and sent to the connected controller,
 // the OFP_PACKET_IN messages are used. If the complete packet needs to be sent to the controller, because it can not be
diff --git a/src/openflow/messages/OFP_Packet_Out.msg b/src/openflow/messages/OFP_Packet_Out.msg
index d5a9495..bf34a93 100644
--- a/src/openflow/messages/OFP_Packet_Out.msg
+++ b/src/openflow/messages/OFP_Packet_Out.msg
@@ -1,8 +1,9 @@
+import openflow.messages.Open_Flow_Message;
 
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"
-    #include "inet/linklayer/ethernet/EtherFrame_m.h"
+//    #include "openflow/messages/Open_Flow_Message_m.h"
+//    #include "inet/linklayer/ethernet/EtherFrame_m.h"
     
     inline std::ostream& operator<<(std::ostream& os, ofp_action_output action)
     {
@@ -12,9 +13,17 @@ cplusplus {{
 }};
 
 //struct ofp_action_header;
-struct ofp_action_output;
-class EthernetIIFrame;
-packet Open_Flow_Message;
+class ofp_action_output
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
+
+
+//struct ofp_action_output;
+//class EthernetIIFrame;
+//packet Open_Flow_Message;
 
 //When the controller decides to send a packet out through the data plane, it uses the
 //OFP PACKET OUT message.
@@ -26,7 +35,7 @@ packet OFP_Packet_Out extends Open_Flow_Message
 
 	 ofp_action_output actions[]; // Action list. 
 //	 EthernetIIFrame frame;
-	 uint8_t data[0];   // Packet data. The length is inferred
+	 uint8_t data[];   // Packet data. The length is inferred
 							//from the length field in the header.
 							//(Only meaningful if buffer_id == -1.) 
 }
\ No newline at end of file
diff --git a/src/openflow/messages/OFP_Port_Mod.msg b/src/openflow/messages/OFP_Port_Mod.msg
index 3e72471..0520367 100644
--- a/src/openflow/messages/OFP_Port_Mod.msg
+++ b/src/openflow/messages/OFP_Port_Mod.msg
@@ -1,12 +1,12 @@
-
+import openflow.messages.Open_Flow_Message;
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
-    #include "openflow/messages/Open_Flow_Message_m.h"    
+ //   #include "openflow/messages/Open_Flow_Message_m.h"    
     
 }};
 
 //struct ofp_action_header;
-packet Open_Flow_Message;
+//packet Open_Flow_Message;
 
 
 packet OFP_Port_Mod extends Open_Flow_Message
diff --git a/src/openflow/messages/Open_Flow_Message.msg b/src/openflow/messages/Open_Flow_Message.msg
index b8572e7..bbe5ea6 100644
--- a/src/openflow/messages/Open_Flow_Message.msg
+++ b/src/openflow/messages/Open_Flow_Message.msg
@@ -1,10 +1,15 @@
 
-
 cplusplus {{
     #include "openflow/openflow/protocol/openflow.h"
 }};
 
-class ofp_header extends void;
+//class ofp_header extends void;
+class ofp_header
+{
+    @existingClass;
+    @opaque;
+//    @toString(.str());
+}
 
 // base class for all OpenFlow protocol messages; only contains the OpenFlow header
 packet Open_Flow_Message
diff --git a/src/openflow/openflow/controller/OF_Controller.cc b/src/openflow/openflow/controller/OF_Controller.cc
index d671a84..7173b53 100644
--- a/src/openflow/openflow/controller/OF_Controller.cc
+++ b/src/openflow/openflow/controller/OF_Controller.cc
@@ -134,7 +134,7 @@ void OF_Controller::calcAvgQueueSize(int size){
 void OF_Controller::processQueuedMsg(cMessage *data_msg){
     if (dynamic_cast<Open_Flow_Message *>(data_msg) != NULL) {
         Open_Flow_Message *of_msg = (Open_Flow_Message *)data_msg;
-        ofp_type type = (ofp_type)of_msg->getHeader().type;
+        ofp_type type = (ofp_type)of_msg->getHeaderForUpdate().type;
 
         switch (type) {
             case OFPT_FEATURES_REPLY:
@@ -158,8 +158,8 @@ void OF_Controller::processQueuedMsg(cMessage *data_msg){
 
 void OF_Controller::sendHello(Open_Flow_Message *msg){
     OFP_Hello *hello = new OFP_Hello("Hello");
-    hello->getHeader().version = OFP_VERSION;
-    hello->getHeader().type = OFPT_HELLO;
+    hello->getHeaderForUpdate().version = OFP_VERSION;
+    hello->getHeaderForUpdate().type = OFPT_HELLO;
     hello->setByteLength(8);
     hello->setKind(TCP_C_SEND);
 
@@ -170,8 +170,8 @@ void OF_Controller::sendHello(Open_Flow_Message *msg){
 
 void OF_Controller::sendFeatureRequest(cMessage *msg){
     OFP_Features_Request *featuresRequest = new OFP_Features_Request("FeaturesRequest");
-    featuresRequest->getHeader().version = OFP_VERSION;
-    featuresRequest->getHeader().type = OFPT_FEATURES_REQUEST;
+    featuresRequest->getHeaderForUpdate().version = OFP_VERSION;
+    featuresRequest->getHeaderForUpdate().type = OFPT_FEATURES_REQUEST;
     featuresRequest->setByteLength(8);
     featuresRequest->setKind(TCP_C_SEND);
 
@@ -218,7 +218,7 @@ void OF_Controller::registerConnection(Open_Flow_Message *msg){
         swInfo.setConnId(socket->getConnectionId());
         swInfo.setMacAddress("");
         swInfo.setNumOfPorts(-1);
-        swInfo.setVersion(msg->getHeader().version);
+        swInfo.setVersion(msg->getHeaderForUpdate().version);
         switchesList.push_back(swInfo);
     }
 }
diff --git a/src/openflow/openflow/switch/OF_Switch.cc b/src/openflow/openflow/switch/OF_Switch.cc
index 93bd605..540197e 100644
--- a/src/openflow/openflow/switch/OF_Switch.cc
+++ b/src/openflow/openflow/switch/OF_Switch.cc
@@ -183,8 +183,8 @@ void OF_Switch::connect(const char *addressToConnect){
 
     socket.connect(L3AddressResolver().resolve(connectAddress), connectPort);
     OFP_Hello *msg = new OFP_Hello("Hello");
-    msg->getHeader().version = OFP_VERSION;
-    msg->getHeader().type = OFPT_HELLO;
+    msg->getHeaderForUpdate().version = OFP_VERSION;
+    msg->getHeaderForUpdate().type = OFPT_HELLO;
     msg->setByteLength(8);
     msg->setKind(TCP_C_SEND);
     socket.send(msg);
@@ -208,7 +208,7 @@ void OF_Switch::processQueuedMsg(cMessage *data_msg){
         controlPlanePacket++;
        if (dynamic_cast<Open_Flow_Message *>(data_msg) != NULL) { //msg from controller
             Open_Flow_Message *of_msg = (Open_Flow_Message *)data_msg;
-            ofp_type type = (ofp_type)of_msg->getHeader().type;
+            ofp_type type = (ofp_type)of_msg->getHeaderForUpdate().type;
             switch (type){
                 case OFPT_FEATURES_REQUEST:
                     handleFeaturesRequestMessage(of_msg);
@@ -269,8 +269,8 @@ void OF_Switch::processFrame(EthernetIIFrame *frame){
        if(outport == OFPP_CONTROLLER){
            //send it to the controller
            OFP_Packet_In *packetIn = new OFP_Packet_In("packetIn");
-           packetIn->getHeader().version = OFP_VERSION;
-           packetIn->getHeader().type = OFPT_PACKET_IN;
+           packetIn->getHeaderForUpdate().version = OFP_VERSION;
+           packetIn->getHeaderForUpdate().type = OFPT_PACKET_IN;
            packetIn->setReason(OFPR_ACTION);
            packetIn->setByteLength(32);
            packetIn->encapsulate(frame);
@@ -299,8 +299,8 @@ void OF_Switch::processFrame(EthernetIIFrame *frame){
 
 void OF_Switch::handleFeaturesRequestMessage(Open_Flow_Message *of_msg){
     OFP_Features_Reply *featuresReply = new OFP_Features_Reply("FeaturesReply");
-    featuresReply->getHeader().version = OFP_VERSION;
-    featuresReply->getHeader().type = OFPT_FEATURES_REPLY;
+    featuresReply->getHeaderForUpdate().version = OFP_VERSION;
+    featuresReply->getHeaderForUpdate().type = OFPT_FEATURES_REPLY;
 
     IInterfaceTable *inet_ift = getModuleFromPar<IInterfaceTable>(par("interfaceTableModule"), this);
 
@@ -333,8 +333,8 @@ void OF_Switch::handleFlowModMessage(Open_Flow_Message *of_msg){
 
 void OF_Switch::handleMissMatchedPacket(EthernetIIFrame *frame){
     OFP_Packet_In *packetIn = new OFP_Packet_In("packetIn");
-    packetIn->getHeader().version = OFP_VERSION;
-    packetIn->getHeader().type = OFPT_PACKET_IN;
+    packetIn->getHeaderForUpdate().version = OFP_VERSION;
+    packetIn->getHeaderForUpdate().type = OFPT_PACKET_IN;
     packetIn->setReason(OFPR_NO_MATCH);
 
     packetIn->setByteLength(32);
@@ -388,7 +388,7 @@ void OF_Switch::handlePacketOutMessage(Open_Flow_Message *of_msg){
 
     //execute
     for (unsigned int i = 0; i < actions_size; ++i){
-        executePacketOutAction(&(packet_out_msg->getActions(i)), frame, inPort);
+        executePacketOutAction(&(packet_out_msg->getActionsForUpdate(i)), frame, inPort);
     }
 }