Step 2: Move test folder to root

Change-Id: I26bbe73fe106247b32ca237546436e92d34cf114
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/test/csit/libraries/AAAJsonUtils.py b/csit/libraries/AAAJsonUtils.py
similarity index 100%
rename from test/csit/libraries/AAAJsonUtils.py
rename to csit/libraries/AAAJsonUtils.py

diff --git a/test/csit/libraries/AAAKeywords.html b/csit/libraries/AAAKeywords.html
similarity index 100%
rename from test/csit/libraries/AAAKeywords.html
rename to csit/libraries/AAAKeywords.html

diff --git a/test/csit/libraries/AAAKeywords.robot b/csit/libraries/AAAKeywords.robot
similarity index 100%
rename from test/csit/libraries/AAAKeywords.robot
rename to csit/libraries/AAAKeywords.robot

diff --git a/test/csit/libraries/CapwapLibrary.py b/csit/libraries/CapwapLibrary.py
similarity index 100%
rename from test/csit/libraries/CapwapLibrary.py
rename to csit/libraries/CapwapLibrary.py

diff --git a/test/csit/libraries/CarsAndPeopleCRUD.robot b/csit/libraries/CarsAndPeopleCRUD.robot
similarity index 100%
rename from test/csit/libraries/CarsAndPeopleCRUD.robot
rename to csit/libraries/CarsAndPeopleCRUD.robot

diff --git a/test/csit/libraries/ClusterKeywords.robot b/csit/libraries/ClusterKeywords.robot
similarity index 100%
rename from test/csit/libraries/ClusterKeywords.robot
rename to csit/libraries/ClusterKeywords.robot

diff --git a/test/csit/libraries/ClusterStateLibrary.py b/csit/libraries/ClusterStateLibrary.py
similarity index 100%
rename from test/csit/libraries/ClusterStateLibrary.py
rename to csit/libraries/ClusterStateLibrary.py

diff --git a/test/csit/libraries/Common.py b/csit/libraries/Common.py
similarity index 100%
rename from test/csit/libraries/Common.py
rename to csit/libraries/Common.py

diff --git a/test/csit/libraries/ConfigViaRestconf.robot b/csit/libraries/ConfigViaRestconf.robot
similarity index 100%
rename from test/csit/libraries/ConfigViaRestconf.robot
rename to csit/libraries/ConfigViaRestconf.robot

diff --git a/test/csit/libraries/CrudLibrary.py b/csit/libraries/CrudLibrary.py
similarity index 100%
rename from test/csit/libraries/CrudLibrary.py
rename to csit/libraries/CrudLibrary.py

diff --git a/test/csit/libraries/DatastoreCRUD.robot b/csit/libraries/DatastoreCRUD.robot
similarity index 100%
rename from test/csit/libraries/DatastoreCRUD.robot
rename to csit/libraries/DatastoreCRUD.robot

diff --git a/test/csit/libraries/Docker.py b/csit/libraries/Docker.py
similarity index 100%
rename from test/csit/libraries/Docker.py
rename to csit/libraries/Docker.py

diff --git a/test/csit/libraries/DynamicMininet.py b/csit/libraries/DynamicMininet.py
similarity index 100%
rename from test/csit/libraries/DynamicMininet.py
rename to csit/libraries/DynamicMininet.py

diff --git a/test/csit/libraries/FailFast.robot b/csit/libraries/FailFast.robot
similarity index 100%
rename from test/csit/libraries/FailFast.robot
rename to csit/libraries/FailFast.robot

diff --git a/test/csit/libraries/FlowLib.html b/csit/libraries/FlowLib.html
similarity index 100%
rename from test/csit/libraries/FlowLib.html
rename to csit/libraries/FlowLib.html

diff --git a/test/csit/libraries/FlowLib.py b/csit/libraries/FlowLib.py
similarity index 100%
rename from test/csit/libraries/FlowLib.py
rename to csit/libraries/FlowLib.py

diff --git a/test/csit/libraries/FlowLib.robot b/csit/libraries/FlowLib.robot
similarity index 100%
rename from test/csit/libraries/FlowLib.robot
rename to csit/libraries/FlowLib.robot

diff --git a/test/csit/libraries/HsfJson/hsf_json.py b/csit/libraries/HsfJson/hsf_json.py
similarity index 100%
rename from test/csit/libraries/HsfJson/hsf_json.py
rename to csit/libraries/HsfJson/hsf_json.py

diff --git a/test/csit/libraries/HsfJson/hsfl.py b/csit/libraries/HsfJson/hsfl.py
similarity index 100%
rename from test/csit/libraries/HsfJson/hsfl.py
rename to csit/libraries/HsfJson/hsfl.py

diff --git a/test/csit/libraries/HsfJson/hsfod.py b/csit/libraries/HsfJson/hsfod.py
similarity index 100%
rename from test/csit/libraries/HsfJson/hsfod.py
rename to csit/libraries/HsfJson/hsfod.py

diff --git a/test/csit/libraries/KarafKeywords.robot b/csit/libraries/KarafKeywords.robot
similarity index 100%
rename from test/csit/libraries/KarafKeywords.robot
rename to csit/libraries/KarafKeywords.robot

diff --git a/test/csit/libraries/KillPythonTool.robot b/csit/libraries/KillPythonTool.robot
similarity index 100%
rename from test/csit/libraries/KillPythonTool.robot
rename to csit/libraries/KillPythonTool.robot

diff --git a/test/csit/libraries/MininetTopo/create_fullymesh.py b/csit/libraries/MininetTopo/create_fullymesh.py
similarity index 100%
rename from test/csit/libraries/MininetTopo/create_fullymesh.py
rename to csit/libraries/MininetTopo/create_fullymesh.py

diff --git a/test/csit/libraries/NicKeywords.robot b/csit/libraries/NicKeywords.robot
similarity index 100%
rename from test/csit/libraries/NicKeywords.robot
rename to csit/libraries/NicKeywords.robot

diff --git a/test/csit/libraries/OVSDB.robot b/csit/libraries/OVSDB.robot
similarity index 100%
rename from test/csit/libraries/OVSDB.robot
rename to csit/libraries/OVSDB.robot

diff --git a/test/csit/libraries/PcepOperations.robot b/csit/libraries/PcepOperations.robot
similarity index 100%
rename from test/csit/libraries/PcepOperations.robot
rename to csit/libraries/PcepOperations.robot

diff --git a/test/csit/libraries/RequestsLibrary.py b/csit/libraries/RequestsLibrary.py
similarity index 100%
rename from test/csit/libraries/RequestsLibrary.py
rename to csit/libraries/RequestsLibrary.py

diff --git a/test/csit/libraries/Scalability.robot b/csit/libraries/Scalability.robot
similarity index 100%
rename from test/csit/libraries/Scalability.robot
rename to csit/libraries/Scalability.robot

diff --git a/test/csit/libraries/ScaleClient.py b/csit/libraries/ScaleClient.py
similarity index 100%
rename from test/csit/libraries/ScaleClient.py
rename to csit/libraries/ScaleClient.py

diff --git a/test/csit/libraries/SettingsLibrary.py b/csit/libraries/SettingsLibrary.py
similarity index 100%
rename from test/csit/libraries/SettingsLibrary.py
rename to csit/libraries/SettingsLibrary.py

diff --git a/test/csit/libraries/SwitchClasses/BaseSwitch.py b/csit/libraries/SwitchClasses/BaseSwitch.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/BaseSwitch.py
rename to csit/libraries/SwitchClasses/BaseSwitch.py

diff --git a/test/csit/libraries/SwitchClasses/H3C.py b/csit/libraries/SwitchClasses/H3C.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/H3C.py
rename to csit/libraries/SwitchClasses/H3C.py

diff --git a/test/csit/libraries/SwitchClasses/H3C_5920.py b/csit/libraries/SwitchClasses/H3C_5920.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/H3C_5920.py
rename to csit/libraries/SwitchClasses/H3C_5920.py

diff --git a/test/csit/libraries/SwitchClasses/Ovs.py b/csit/libraries/SwitchClasses/Ovs.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/Ovs.py
rename to csit/libraries/SwitchClasses/Ovs.py

diff --git a/test/csit/libraries/SwitchClasses/ProVision.py b/csit/libraries/SwitchClasses/ProVision.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/ProVision.py
rename to csit/libraries/SwitchClasses/ProVision.py

diff --git a/test/csit/libraries/SwitchClasses/ProVision_3800.py b/csit/libraries/SwitchClasses/ProVision_3800.py
similarity index 100%
rename from test/csit/libraries/SwitchClasses/ProVision_3800.py
rename to csit/libraries/SwitchClasses/ProVision_3800.py

diff --git a/test/csit/libraries/SwitchManager.py b/csit/libraries/SwitchManager.py
similarity index 100%
rename from test/csit/libraries/SwitchManager.py
rename to csit/libraries/SwitchManager.py

diff --git a/test/csit/libraries/SwitchUtils.html b/csit/libraries/SwitchUtils.html
similarity index 100%
rename from test/csit/libraries/SwitchUtils.html
rename to csit/libraries/SwitchUtils.html

diff --git a/test/csit/libraries/SwitchUtils.robot b/csit/libraries/SwitchUtils.robot
similarity index 100%
rename from test/csit/libraries/SwitchUtils.robot
rename to csit/libraries/SwitchUtils.robot

diff --git a/test/csit/libraries/Topology.py b/csit/libraries/Topology.py
similarity index 100%
rename from test/csit/libraries/Topology.py
rename to csit/libraries/Topology.py

diff --git a/test/csit/libraries/Topologynew.py b/csit/libraries/Topologynew.py
similarity index 100%
rename from test/csit/libraries/Topologynew.py
rename to csit/libraries/Topologynew.py

diff --git a/test/csit/libraries/TsdrUtils.robot b/csit/libraries/TsdrUtils.robot
similarity index 100%
rename from test/csit/libraries/TsdrUtils.robot
rename to csit/libraries/TsdrUtils.robot

diff --git a/test/csit/libraries/UtilLibrary.py b/csit/libraries/UtilLibrary.py
similarity index 100%
rename from test/csit/libraries/UtilLibrary.py
rename to csit/libraries/UtilLibrary.py

diff --git a/test/csit/libraries/Utils.html b/csit/libraries/Utils.html
similarity index 100%
rename from test/csit/libraries/Utils.html
rename to csit/libraries/Utils.html

diff --git a/test/csit/libraries/Utils.robot b/csit/libraries/Utils.robot
similarity index 100%
rename from test/csit/libraries/Utils.robot
rename to csit/libraries/Utils.robot

diff --git a/test/csit/libraries/VtnCoKeywords.robot b/csit/libraries/VtnCoKeywords.robot
similarity index 100%
rename from test/csit/libraries/VtnCoKeywords.robot
rename to csit/libraries/VtnCoKeywords.robot

diff --git a/test/csit/libraries/VtnMaKeywords.robot b/csit/libraries/VtnMaKeywords.robot
similarity index 100%
rename from test/csit/libraries/VtnMaKeywords.robot
rename to csit/libraries/VtnMaKeywords.robot

diff --git a/test/csit/libraries/WaitForFailure.robot b/csit/libraries/WaitForFailure.robot
similarity index 100%
rename from test/csit/libraries/WaitForFailure.robot
rename to csit/libraries/WaitForFailure.robot

diff --git a/test/csit/libraries/XmlComparator.py b/csit/libraries/XmlComparator.py
similarity index 100%
rename from test/csit/libraries/XmlComparator.py
rename to csit/libraries/XmlComparator.py

diff --git a/test/csit/libraries/ciotdm.py b/csit/libraries/ciotdm.py
similarity index 100%
rename from test/csit/libraries/ciotdm.py
rename to csit/libraries/ciotdm.py

diff --git a/test/csit/libraries/criotdm.py b/csit/libraries/criotdm.py
similarity index 100%
rename from test/csit/libraries/criotdm.py
rename to csit/libraries/criotdm.py

diff --git a/test/csit/libraries/iotdm.py b/csit/libraries/iotdm.py
similarity index 100%
rename from test/csit/libraries/iotdm.py
rename to csit/libraries/iotdm.py

diff --git a/test/csit/libraries/ipaddr.py b/csit/libraries/ipaddr.py
similarity index 100%
rename from test/csit/libraries/ipaddr.py
rename to csit/libraries/ipaddr.py

diff --git a/test/csit/libraries/riotdm.py b/csit/libraries/riotdm.py
similarity index 100%
rename from test/csit/libraries/riotdm.py
rename to csit/libraries/riotdm.py

diff --git a/test/csit/scriptplans/integration-basic.txt b/csit/scriptplans/integration-basic.txt
similarity index 100%
rename from test/csit/scriptplans/integration-basic.txt
rename to csit/scriptplans/integration-basic.txt

diff --git a/test/csit/scriptplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt b/csit/scriptplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/scriptplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt
rename to csit/scriptplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt

diff --git a/test/csit/scriptplans/openflowplugin-scale-stats-collection-daily.txt b/csit/scriptplans/openflowplugin-scale-stats-collection-daily.txt
similarity index 100%
rename from test/csit/scriptplans/openflowplugin-scale-stats-collection-daily.txt
rename to csit/scriptplans/openflowplugin-scale-stats-collection-daily.txt

diff --git a/test/csit/scriptplans/tsdr-hbase-datastore.txt b/csit/scriptplans/tsdr-hbase-datastore.txt
similarity index 100%
rename from test/csit/scriptplans/tsdr-hbase-datastore.txt
rename to csit/scriptplans/tsdr-hbase-datastore.txt

diff --git a/test/csit/scripts/controllermem_6g.sh b/csit/scripts/controllermem_6g.sh
similarity index 100%
rename from test/csit/scripts/controllermem_6g.sh
rename to csit/scripts/controllermem_6g.sh

diff --git a/test/csit/suites/aaa/authn/010_Credential_Authentication.robot b/csit/suites/aaa/authn/010_Credential_Authentication.robot
similarity index 100%
rename from test/csit/suites/aaa/authn/010_Credential_Authentication.robot
rename to csit/suites/aaa/authn/010_Credential_Authentication.robot

diff --git a/test/csit/suites/aaa/authn/020_Identity_Management.robot b/csit/suites/aaa/authn/020_Identity_Management.robot
similarity index 100%
rename from test/csit/suites/aaa/authn/020_Identity_Management.robot
rename to csit/suites/aaa/authn/020_Identity_Management.robot

diff --git a/test/csit/suites/aaa/authn/__init__.robot b/csit/suites/aaa/authn/__init__.robot
similarity index 100%
rename from test/csit/suites/aaa/authn/__init__.robot
rename to csit/suites/aaa/authn/__init__.robot

diff --git a/test/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot b/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot
similarity index 100%
rename from test/csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot
rename to csit/suites/aaa/idmlite/010_CRUD_Rest_CommandsTests.robot

diff --git a/test/csit/suites/aaa/idmlite/idmliteCrud.robot b/csit/suites/aaa/idmlite/idmliteCrud.robot
similarity index 100%
rename from test/csit/suites/aaa/idmlite/idmliteCrud.robot
rename to csit/suites/aaa/idmlite/idmliteCrud.robot

diff --git a/test/csit/suites/bgpcep/bgpuser/cases.robot b/csit/suites/bgpcep/bgpuser/cases.robot
similarity index 100%
rename from test/csit/suites/bgpcep/bgpuser/cases.robot
rename to csit/suites/bgpcep/bgpuser/cases.robot

diff --git a/test/csit/suites/bgpcep/pcepuser/pcepuser.robot b/csit/suites/bgpcep/pcepuser/pcepuser.robot
similarity index 100%
rename from test/csit/suites/bgpcep/pcepuser/pcepuser.robot
rename to csit/suites/bgpcep/pcepuser/pcepuser.robot

diff --git a/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot b/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
similarity index 100%
rename from test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot
rename to csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot

diff --git a/test/csit/suites/capwap/basic/capwap_session.robot b/csit/suites/capwap/basic/capwap_session.robot
similarity index 100%
rename from test/csit/suites/capwap/basic/capwap_session.robot
rename to csit/suites/capwap/basic/capwap_session.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot b/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/001_start_cluster.robot
rename to csit/suites/controller/Clustering_Datastore/001_start_cluster.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/010_crud_on_leader.robot b/csit/suites/controller/Clustering_Datastore/010_crud_on_leader.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/010_crud_on_leader.robot
rename to csit/suites/controller/Clustering_Datastore/010_crud_on_leader.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/020_crud_on_any_follower.robot b/csit/suites/controller/Clustering_Datastore/020_crud_on_any_follower.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/020_crud_on_any_follower.robot
rename to csit/suites/controller/Clustering_Datastore/020_crud_on_any_follower.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/030_car_failover_crud_on_new_leader.robot b/csit/suites/controller/Clustering_Datastore/030_car_failover_crud_on_new_leader.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/030_car_failover_crud_on_new_leader.robot
rename to csit/suites/controller/Clustering_Datastore/030_car_failover_crud_on_new_leader.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/040_people_failover_crud_on_new_leader.robot b/csit/suites/controller/Clustering_Datastore/040_people_failover_crud_on_new_leader.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/040_people_failover_crud_on_new_leader.robot
rename to csit/suites/controller/Clustering_Datastore/040_people_failover_crud_on_new_leader.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot b/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot
rename to csit/suites/controller/Clustering_Datastore/050_car_persistence_recovery.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot b/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot
rename to csit/suites/controller/Clustering_Datastore/140_recovery_restart_follower.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/999_cleanup.robot b/csit/suites/controller/Clustering_Datastore/999_cleanup.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/999_cleanup.robot
rename to csit/suites/controller/Clustering_Datastore/999_cleanup.robot

diff --git a/test/csit/suites/controller/Clustering_Datastore/__init__.robot b/csit/suites/controller/Clustering_Datastore/__init__.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Datastore/__init__.robot
rename to csit/suites/controller/Clustering_Datastore/__init__.robot

diff --git a/test/csit/suites/controller/Clustering_Longevity/010__longevity.robot b/csit/suites/controller/Clustering_Longevity/010__longevity.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Longevity/010__longevity.robot
rename to csit/suites/controller/Clustering_Longevity/010__longevity.robot

diff --git a/test/csit/suites/controller/Clustering_Longevity/__init__.robot b/csit/suites/controller/Clustering_Longevity/__init__.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Longevity/__init__.robot
rename to csit/suites/controller/Clustering_Longevity/__init__.robot

diff --git a/test/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot b/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot
rename to csit/suites/controller/Clustering_Routedrpc/001_start_cluster.robot

diff --git a/test/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot b/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot
similarity index 100%
rename from test/csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot
rename to csit/suites/controller/Clustering_Routedrpc/023_routed_rpc_crud_test.robot

diff --git a/test/csit/suites/controller/NETCONF/010__netconf_inventory.robot b/csit/suites/controller/NETCONF/010__netconf_inventory.robot
similarity index 100%
rename from test/csit/suites/controller/NETCONF/010__netconf_inventory.robot
rename to csit/suites/controller/NETCONF/010__netconf_inventory.robot

diff --git a/test/csit/suites/didm/basic/010_Didm.robot b/csit/suites/didm/basic/010_Didm.robot
similarity index 100%
rename from test/csit/suites/didm/basic/010_Didm.robot
rename to csit/suites/didm/basic/010_Didm.robot

diff --git a/test/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
similarity index 100%
rename from test/csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot
rename to csit/suites/groupbasedpolicy/Clustering_Datastore/020_simple_clustering.robot

diff --git a/test/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot b/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot
similarity index 100%
rename from test/csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot
rename to csit/suites/groupbasedpolicy/GBP_Basic/010_gbp_endpoint.robot

diff --git a/test/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot b/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
similarity index 100%
rename from test/csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot
rename to csit/suites/groupbasedpolicy/GBP_Basic/020_gbp_tenant.robot

diff --git a/test/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot b/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot
similarity index 100%
rename from test/csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot
rename to csit/suites/groupbasedpolicy/GBP_Basic/030_gbp_tunnel.robot

diff --git a/test/csit/suites/integration/basic/010_Restconf_OK.robot b/csit/suites/integration/basic/010_Restconf_OK.robot
similarity index 100%
rename from test/csit/suites/integration/basic/010_Restconf_OK.robot
rename to csit/suites/integration/basic/010_Restconf_OK.robot

diff --git a/test/csit/suites/integration/scripts/sample.sh b/csit/suites/integration/scripts/sample.sh
similarity index 100%
rename from test/csit/suites/integration/scripts/sample.sh
rename to csit/suites/integration/scripts/sample.sh

diff --git a/test/csit/suites/iotdm/basic/010_Restconf_OK.robot b/csit/suites/iotdm/basic/010_Restconf_OK.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/010_Restconf_OK.robot
rename to csit/suites/iotdm/basic/010_Restconf_OK.robot

diff --git a/test/csit/suites/iotdm/basic/030_LayerTest.robot b/csit/suites/iotdm/basic/030_LayerTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/030_LayerTest.robot
rename to csit/suites/iotdm/basic/030_LayerTest.robot

diff --git a/test/csit/suites/iotdm/basic/040_AEAttributeTest.robot b/csit/suites/iotdm/basic/040_AEAttributeTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/040_AEAttributeTest.robot
rename to csit/suites/iotdm/basic/040_AEAttributeTest.robot

diff --git a/test/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot b/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/050_ContainerAttributeTest.robot
rename to csit/suites/iotdm/basic/050_ContainerAttributeTest.robot

diff --git a/test/csit/suites/iotdm/basic/060_ConInAttributeTest.robot b/csit/suites/iotdm/basic/060_ConInAttributeTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/060_ConInAttributeTest.robot
rename to csit/suites/iotdm/basic/060_ConInAttributeTest.robot

diff --git a/test/csit/suites/iotdm/basic/070_DeleteTest.robot b/csit/suites/iotdm/basic/070_DeleteTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/070_DeleteTest.robot
rename to csit/suites/iotdm/basic/070_DeleteTest.robot

diff --git a/test/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot b/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot
similarity index 100%
rename from test/csit/suites/iotdm/basic/080_FilterCriteriaTest.robot
rename to csit/suites/iotdm/basic/080_FilterCriteriaTest.robot

diff --git a/test/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot b/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot
similarity index 100%
rename from test/csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot
rename to csit/suites/l2switch/Address_Tracking_OF13/010__restconf_inv_addresses.robot

diff --git a/test/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot b/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/l2switch/Address_Tracking_OF13/__init__.robot
rename to csit/suites/l2switch/Address_Tracking_OF13/__init__.robot

diff --git a/test/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot b/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot
similarity index 100%
rename from test/csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot
rename to csit/suites/l2switch/Flow_Programming_OF13/010__restconf_inv_flows.robot

diff --git a/test/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot b/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/l2switch/Flow_Programming_OF13/__init__.robot
rename to csit/suites/l2switch/Flow_Programming_OF13/__init__.robot

diff --git a/test/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot b/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot
similarity index 100%
rename from test/csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot
rename to csit/suites/l2switch/Host_Tracking_OF13/010__restconf_topo_nodes.robot

diff --git a/test/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot b/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/l2switch/Host_Tracking_OF13/__init__.robot
rename to csit/suites/l2switch/Host_Tracking_OF13/__init__.robot

diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot
similarity index 100%
rename from test/csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot
rename to csit/suites/l2switch/Inventory_Scalability_OF13/010__restconf_inventory.robot

diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot
similarity index 100%
rename from test/csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot
rename to csit/suites/l2switch/Inventory_Scalability_OF13/020__restconf_topology.robot

diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/030__ping_test.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/030__ping_test.robot
similarity index 100%
rename from test/csit/suites/l2switch/Inventory_Scalability_OF13/030__ping_test.robot
rename to csit/suites/l2switch/Inventory_Scalability_OF13/030__ping_test.robot

diff --git a/test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot b/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot
rename to csit/suites/l2switch/Inventory_Scalability_OF13/__init__.robot

diff --git a/test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot b/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
similarity index 100%
rename from test/csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot
rename to csit/suites/l2switch/Loop_Removal_OF13/010__loop_of_3.robot

diff --git a/test/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot b/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot
similarity index 100%
rename from test/csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot
rename to csit/suites/l2switch/Maximum_Hosts/010__finding_max_hosts.robot

diff --git a/test/csit/suites/l2switch/topologies/customtopo.py b/csit/suites/l2switch/topologies/customtopo.py
similarity index 100%
rename from test/csit/suites/l2switch/topologies/customtopo.py
rename to csit/suites/l2switch/topologies/customtopo.py

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot b/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot
rename to csit/suites/lacp/Lacp_Feature_OF13/010__lacp_inventory.robot

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot b/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot
rename to csit/suites/lacp/Lacp_Feature_OF13/020__lacp_lag_resiliency.robot

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot b/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot
rename to csit/suites/lacp/Lacp_Feature_OF13/030__lacp_flow_entry_stats.robot

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py b/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py
rename to csit/suites/lacp/Lacp_Feature_OF13/LACP_custom1.py

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot b/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/__init__.robot
rename to csit/suites/lacp/Lacp_Feature_OF13/__init__.robot

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/bonding.conf b/csit/suites/lacp/Lacp_Feature_OF13/bonding.conf
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/bonding.conf
rename to csit/suites/lacp/Lacp_Feature_OF13/bonding.conf

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/h1-bond0.sh b/csit/suites/lacp/Lacp_Feature_OF13/h1-bond0.sh
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/h1-bond0.sh
rename to csit/suites/lacp/Lacp_Feature_OF13/h1-bond0.sh

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/h2-bond0.sh b/csit/suites/lacp/Lacp_Feature_OF13/h2-bond0.sh
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/h2-bond0.sh
rename to csit/suites/lacp/Lacp_Feature_OF13/h2-bond0.sh

diff --git a/test/csit/suites/lacp/Lacp_Feature_OF13/m b/csit/suites/lacp/Lacp_Feature_OF13/m
similarity index 100%
rename from test/csit/suites/lacp/Lacp_Feature_OF13/m
rename to csit/suites/lacp/Lacp_Feature_OF13/m

diff --git a/test/csit/suites/lispflowmapping/basic/010_Restconf_OK.robot b/csit/suites/lispflowmapping/basic/010_Restconf_OK.robot
similarity index 100%
rename from test/csit/suites/lispflowmapping/basic/010_Restconf_OK.robot
rename to csit/suites/lispflowmapping/basic/010_Restconf_OK.robot

diff --git a/test/csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot b/csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot
similarity index 100%
rename from test/csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot
rename to csit/suites/lispflowmapping/basic/020_RPC_CRUD.robot

diff --git a/test/csit/suites/lispflowmapping/basic/030_RPC_Datatypes.robot b/csit/suites/lispflowmapping/basic/030_RPC_Datatypes.robot
similarity index 100%
rename from test/csit/suites/lispflowmapping/basic/030_RPC_Datatypes.robot
rename to csit/suites/lispflowmapping/basic/030_RPC_Datatypes.robot

diff --git a/test/csit/suites/nic/basic/010_Restconf_OK.robot b/csit/suites/nic/basic/010_Restconf_OK.robot
similarity index 100%
rename from test/csit/suites/nic/basic/010_Restconf_OK.robot
rename to csit/suites/nic/basic/010_Restconf_OK.robot

diff --git a/test/csit/suites/nic/cli/console.robot b/csit/suites/nic/cli/console.robot
similarity index 100%
rename from test/csit/suites/nic/cli/console.robot
rename to csit/suites/nic/cli/console.robot

diff --git a/test/csit/suites/nic/vtn_renderer/__init__.robot b/csit/suites/nic/vtn_renderer/__init__.robot
similarity index 100%
rename from test/csit/suites/nic/vtn_renderer/__init__.robot
rename to csit/suites/nic/vtn_renderer/__init__.robot

diff --git a/test/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot
similarity index 100%
rename from test/csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot
rename to csit/suites/nic/vtn_renderer/vtn_renderer_nic_cli_test.robot

diff --git a/test/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot b/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot
similarity index 100%
rename from test/csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot
rename to csit/suites/nic/vtn_renderer/vtn_renderer_nic_rest_test.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF10/010__switch_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF10/020__topology_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF10/030__statistics_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF10/040__flow_programmer.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF10/__init__.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF13/010__switch_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF13/020__topology_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF13/030__statistics_manager.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF13/040__flow_programmer.robot

diff --git a/test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot b/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot
rename to csit/suites/openflowplugin/AD_SAL_NSF_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Bug_Validation/2429.robot b/csit/suites/openflowplugin/Bug_Validation/2429.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Bug_Validation/2429.robot
rename to csit/suites/openflowplugin/Bug_Validation/2429.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/010_Lithium_Rps_Calls_Ovs.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/020_Lithium_Rps_Calls_Cpqd.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/030_Flow_Update_Test.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/010_SM_add_upd_del_flows.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/020_SM_sal_add_upd_del_flows.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot b/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot
rename to csit/suites/openflowplugin/Flows_Additional_TCs/Stat_Manager_extended/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot b/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot
rename to csit/suites/openflowplugin/Flows_OF13/300__dst_ip.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot b/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot
rename to csit/suites/openflowplugin/Flows_OF13/301__src_ip.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot b/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot
rename to csit/suites/openflowplugin/Flows_OF13/302__dst_mac.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot b/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot
rename to csit/suites/openflowplugin/Flows_OF13/304__eth_ip_port.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot b/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/305__ttl.robot
rename to csit/suites/openflowplugin/Flows_OF13/305__ttl.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot b/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot
rename to csit/suites/openflowplugin/Flows_OF13/306__eth_ip_qos.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot b/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot
rename to csit/suites/openflowplugin/Flows_OF13/307__eth_ip_qos_port_tcpport.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot b/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot
rename to csit/suites/openflowplugin/Flows_OF13/308__eth_ip_qos_port_tcpport_mpls.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot b/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot
rename to csit/suites/openflowplugin/Flows_OF13/309__eth_ip_qos_sctp.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot b/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot
rename to csit/suites/openflowplugin/Flows_OF13/310__eth_ip_qos_icmp.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot b/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot
rename to csit/suites/openflowplugin/Flows_OF13/311__eth_arp.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot b/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot
rename to csit/suites/openflowplugin/Flows_OF13/312__eth_arp_transport.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot b/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot
rename to csit/suites/openflowplugin/Flows_OF13/313__eth_arp_transport_hardware.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot b/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot
rename to csit/suites/openflowplugin/Flows_OF13/314__eth_vlan.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot b/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot
rename to csit/suites/openflowplugin/Flows_OF13/315__timeout_vlan_pcp_vlan.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot b/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot
rename to csit/suites/openflowplugin/Flows_OF13/316__eth_mpls_tc_bos.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot b/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot
rename to csit/suites/openflowplugin/Flows_OF13/317__eth_ipv6.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot b/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/318__metadata.robot
rename to csit/suites/openflowplugin/Flows_OF13/318__metadata.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot b/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot
rename to csit/suites/openflowplugin/Flows_OF13/319__metadata_mask.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot b/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot
rename to csit/suites/openflowplugin/Flows_OF13/320__ipv6_meta_qos_udp.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot b/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot
rename to csit/suites/openflowplugin/Flows_OF13/321__ipv6_meta_qos_tcp.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot b/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot
rename to csit/suites/openflowplugin/Flows_OF13/322__ipv6_flow.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot b/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot
rename to csit/suites/openflowplugin/Flows_OF13/323__tunnel.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot b/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot
rename to csit/suites/openflowplugin/Flows_OF13/324__ipv6_flow_label.robot

diff --git a/test/csit/suites/openflowplugin/Flows_OF13/__init__.robot b/csit/suites/openflowplugin/Flows_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_OF13/__init__.robot
rename to csit/suites/openflowplugin/Flows_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot b/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot
rename to csit/suites/openflowplugin/Flows_Stats_OF13/010__SM_add_upd_del_flows.robot

diff --git a/test/csit/suites/openflowplugin/Flows_Stats_OF13/__init__.robot b/csit/suites/openflowplugin/Flows_Stats_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Flows_Stats_OF13/__init__.robot
rename to csit/suites/openflowplugin/Flows_Stats_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot
rename to csit/suites/openflowplugin/Groups_Meters_OF13/005__openflow_group.robot

diff --git a/test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot
rename to csit/suites/openflowplugin/Groups_Meters_OF13/010__openflow_meter.robot

diff --git a/test/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot b/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot
rename to csit/suites/openflowplugin/Groups_Meters_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/010__restconf_inventory.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/020__restconf_topology.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/030__switch_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/040__statistics_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/050__topology_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF10/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/010__restconf_inventory.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/020__restconf_topology.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/030__switch_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/040__statistics_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/050__topology_manager.robot

diff --git a/test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot b/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot
rename to csit/suites/openflowplugin/Inventory_Scalability_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot b/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Longevity/010__longevity_switches.robot
rename to csit/suites/openflowplugin/Longevity/010__longevity_switches.robot

diff --git a/test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot b/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot
rename to csit/suites/openflowplugin/Longevity/020__longevity_switches_links.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF10/010__restconf_inventory.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF10/020__restconf_topology.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF10/030__restconf_statistics.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF10/040__restconf_frm.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF10/__init__.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF13/010__restconf_inventory.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF13/020__restconf_topology.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF13/030__restconf_statistics.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF13/040__restconf_frm.robot

diff --git a/test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot b/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot
rename to csit/suites/openflowplugin/MD_SAL_NSF_OF13/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot b/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot
rename to csit/suites/openflowplugin/Maximum_Links/010__finding_max_links.robot

diff --git a/test/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot
rename to csit/suites/openflowplugin/Maximum_Switches/010__finding_max_switches.robot

diff --git a/test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot b/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot
rename to csit/suites/openflowplugin/Maximum_Switches/020__find_max_switches.robot

diff --git a/test/csit/suites/openflowplugin/Performance/010_Cbench.robot b/csit/suites/openflowplugin/Performance/010_Cbench.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance/010_Cbench.robot
rename to csit/suites/openflowplugin/Performance/010_Cbench.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot b/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/010_Rest_Config_Flows.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot b/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/020_Stats_Collection_Gauss.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot b/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/030_Stats_Collection_Linear.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot b/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/040_Stats_Collection_One.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot b/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/050_Stats_Collection_FirstTable.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot b/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/060_Stats_Collection_Basic16kScenario.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot b/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/070_Stats_Collection_100k_WithMininetRestart.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot b/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/080_Rpc_100k_Flows_Configuration_Time_Measure.robot

diff --git a/test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot b/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot
rename to csit/suites/openflowplugin/Performance_Flow_Config/090_BulkMaticConfigDsSetup_100k.robot

diff --git a/test/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot b/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot
rename to csit/suites/openflowplugin/Sanity3Node/010__Flows_OF13_Cluster.robot

diff --git a/test/csit/suites/openflowplugin/Sanity3Node/__init__.robot b/csit/suites/openflowplugin/Sanity3Node/__init__.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Sanity3Node/__init__.robot
rename to csit/suites/openflowplugin/Sanity3Node/__init__.robot

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot b/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot
rename to csit/suites/openflowplugin/Switch_Qualification/010_OpenFlow_Connection.robot

diff --git a/test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot b/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
similarity index 100%
rename from test/csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot
rename to csit/suites/openflowplugin/Switch_Qualification/020_OpenFlow_Actions.robot

diff --git a/test/csit/suites/openstack/neutron/010__networks.robot b/csit/suites/openstack/neutron/010__networks.robot
similarity index 100%
rename from test/csit/suites/openstack/neutron/010__networks.robot
rename to csit/suites/openstack/neutron/010__networks.robot

diff --git a/test/csit/suites/openstack/neutron/020__subnets.robot b/csit/suites/openstack/neutron/020__subnets.robot
similarity index 100%
rename from test/csit/suites/openstack/neutron/020__subnets.robot
rename to csit/suites/openstack/neutron/020__subnets.robot

diff --git a/test/csit/suites/openstack/neutron/030__ports.robot b/csit/suites/openstack/neutron/030__ports.robot
similarity index 100%
rename from test/csit/suites/openstack/neutron/030__ports.robot
rename to csit/suites/openstack/neutron/030__ports.robot

diff --git a/test/csit/suites/openstack/neutron/__init__.robot b/csit/suites/openstack/neutron/__init__.robot
similarity index 100%
rename from test/csit/suites/openstack/neutron/__init__.robot
rename to csit/suites/openstack/neutron/__init__.robot

diff --git a/test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot b/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot
rename to csit/suites/ovsdb/Openstack_Neutron/001__connection_manager.robot

diff --git a/test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot b/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot
rename to csit/suites/ovsdb/Openstack_Neutron/010__ovsdb_flow.robot

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot
rename to csit/suites/ovsdb/Southbound_Domain/010__configure_1_ovsdb_node.robot

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot b/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot
rename to csit/suites/ovsdb/Southbound_Domain/020__connection_manager.robot

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot b/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot
rename to csit/suites/ovsdb/Southbound_Domain/030__configure_exit_ovsdb_node.robot

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot b/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot
rename to csit/suites/ovsdb/Southbound_Domain/040__Vxlan_Extension_Test.robot

diff --git a/test/csit/suites/ovsdb/Southbound_Domain/050__Vxlan_Extension_Tunnel_Test.robot b/csit/suites/ovsdb/Southbound_Domain/050__Vxlan_Extension_Tunnel_Test.robot
similarity index 100%
rename from test/csit/suites/ovsdb/Southbound_Domain/050__Vxlan_Extension_Tunnel_Test.robot
rename to csit/suites/ovsdb/Southbound_Domain/050__Vxlan_Extension_Tunnel_Test.robot

diff --git a/test/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot b/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot
similarity index 100%
rename from test/csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot
rename to csit/suites/packetcable/PCMM/010__pcmm_rest_call.robot

diff --git a/test/csit/suites/persistence/basic/test_app.robot b/csit/suites/persistence/basic/test_app.robot
similarity index 100%
rename from test/csit/suites/persistence/basic/test_app.robot
rename to csit/suites/persistence/basic/test_app.robot

diff --git a/test/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot b/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
similarity index 100%
rename from test/csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot
rename to csit/suites/sfc/Clustering_Datastore/020_simple_clustering.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot b/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot
rename to csit/suites/sfc/SFC_Basic/010__sfc_service_functions.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot b/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot
rename to csit/suites/sfc/SFC_Basic/020__sfc_service_forwarders.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot b/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot
rename to csit/suites/sfc/SFC_Basic/030__sfc_service_nodes.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot b/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot
rename to csit/suites/sfc/SFC_Basic/040__sfc_service_chains.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot b/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot
rename to csit/suites/sfc/SFC_Basic/050__sfc_service_schedule_types.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot b/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot
rename to csit/suites/sfc/SFC_Basic/060__sfc_service_paths.robot

diff --git a/test/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot b/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
similarity index 100%
rename from test/csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot
rename to csit/suites/sfc/SFC_Basic/070__sfc_rendered_service_paths.robot

diff --git a/test/csit/suites/snmp/snmp-get/010__snmp_get.robot b/csit/suites/snmp/snmp-get/010__snmp_get.robot
similarity index 100%
rename from test/csit/suites/snmp/snmp-get/010__snmp_get.robot
rename to csit/suites/snmp/snmp-get/010__snmp_get.robot

diff --git a/test/csit/suites/tsdr/H2/010_InterfaceMetrics.robot b/csit/suites/tsdr/H2/010_InterfaceMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/010_InterfaceMetrics.robot
rename to csit/suites/tsdr/H2/010_InterfaceMetrics.robot

diff --git a/test/csit/suites/tsdr/H2/020_FlowMetrics.robot b/csit/suites/tsdr/H2/020_FlowMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/020_FlowMetrics.robot
rename to csit/suites/tsdr/H2/020_FlowMetrics.robot

diff --git a/test/csit/suites/tsdr/H2/030_FlowTableMetrics.robot b/csit/suites/tsdr/H2/030_FlowTableMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/030_FlowTableMetrics.robot
rename to csit/suites/tsdr/H2/030_FlowTableMetrics.robot

diff --git a/test/csit/suites/tsdr/H2/040_QueueMetrics.robot b/csit/suites/tsdr/H2/040_QueueMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/040_QueueMetrics.robot
rename to csit/suites/tsdr/H2/040_QueueMetrics.robot

diff --git a/test/csit/suites/tsdr/H2/050_GroupMetrics.robot b/csit/suites/tsdr/H2/050_GroupMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/050_GroupMetrics.robot
rename to csit/suites/tsdr/H2/050_GroupMetrics.robot

diff --git a/test/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot b/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/H2/060_FlowMeterMetrics.robot
rename to csit/suites/tsdr/H2/060_FlowMeterMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot b/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/010_InterfaceMetrics.robot
rename to csit/suites/tsdr/HBase/010_InterfaceMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/020_FlowMetrics.robot b/csit/suites/tsdr/HBase/020_FlowMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/020_FlowMetrics.robot
rename to csit/suites/tsdr/HBase/020_FlowMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot b/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/030_FlowTableMetrics.robot
rename to csit/suites/tsdr/HBase/030_FlowTableMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/040_QueueMetrics.robot b/csit/suites/tsdr/HBase/040_QueueMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/040_QueueMetrics.robot
rename to csit/suites/tsdr/HBase/040_QueueMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/050_GroupMetrics.robot b/csit/suites/tsdr/HBase/050_GroupMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/050_GroupMetrics.robot
rename to csit/suites/tsdr/HBase/050_GroupMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot b/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
similarity index 100%
rename from test/csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot
rename to csit/suites/tsdr/HBase/060_FlowMeterMetrics.robot

diff --git a/test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh b/csit/suites/tsdr/HBase/scripts/hbase-startup.sh
similarity index 100%
rename from test/csit/suites/tsdr/HBase/scripts/hbase-startup.sh
rename to csit/suites/tsdr/HBase/scripts/hbase-startup.sh

diff --git a/test/csit/suites/usc/channel/USC_CHANNEL.robot b/csit/suites/usc/channel/USC_CHANNEL.robot
similarity index 100%
rename from test/csit/suites/usc/channel/USC_CHANNEL.robot
rename to csit/suites/usc/channel/USC_CHANNEL.robot

diff --git a/test/csit/suites/vpnservice/010__verify_feature.robot b/csit/suites/vpnservice/010__verify_feature.robot
similarity index 100%
rename from test/csit/suites/vpnservice/010__verify_feature.robot
rename to csit/suites/vpnservice/010__verify_feature.robot

diff --git a/test/csit/suites/vpnservice/020__configure_vpn.robot b/csit/suites/vpnservice/020__configure_vpn.robot
similarity index 100%
rename from test/csit/suites/vpnservice/020__configure_vpn.robot
rename to csit/suites/vpnservice/020__configure_vpn.robot

diff --git a/test/csit/suites/vpnservice/030__configure_2_switches.robot b/csit/suites/vpnservice/030__configure_2_switches.robot
similarity index 100%
rename from test/csit/suites/vpnservice/030__configure_2_switches.robot
rename to csit/suites/vpnservice/030__configure_2_switches.robot

diff --git a/test/csit/suites/vpnservice/__init__.robot b/csit/suites/vpnservice/__init__.robot
similarity index 100%
rename from test/csit/suites/vpnservice/__init__.robot
rename to csit/suites/vpnservice/__init__.robot

diff --git a/test/csit/suites/vpnservice/custom.py b/csit/suites/vpnservice/custom.py
similarity index 100%
rename from test/csit/suites/vpnservice/custom.py
rename to csit/suites/vpnservice/custom.py

diff --git a/test/csit/suites/vtn/VTN_C_LAUNCH/020__vtn_coordinator.robot b/csit/suites/vtn/VTN_C_LAUNCH/020__vtn_coordinator.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_LAUNCH/020__vtn_coordinator.robot
rename to csit/suites/vtn/VTN_C_LAUNCH/020__vtn_coordinator.robot

diff --git a/test/csit/suites/vtn/VTN_C_LAUNCH/__init__.robot b/csit/suites/vtn/VTN_C_LAUNCH/__init__.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_LAUNCH/__init__.robot
rename to csit/suites/vtn/VTN_C_LAUNCH/__init__.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot b/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot
rename to csit/suites/vtn/VTN_C_OF10/020__vtn_vbrif_portmap.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot b/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot
rename to csit/suites/vtn/VTN_C_OF10/030__verify_switch.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot
rename to csit/suites/vtn/VTN_C_OF10/040__vtn_vbrif_audit.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF10/__init__.robot b/csit/suites/vtn/VTN_C_OF10/__init__.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF10/__init__.robot
rename to csit/suites/vtn/VTN_C_OF10/__init__.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot b/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot
rename to csit/suites/vtn/VTN_C_OF13/020__vtn_vbrif_portmap.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot b/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot
rename to csit/suites/vtn/VTN_C_OF13/030__verify_switch.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot b/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot
rename to csit/suites/vtn/VTN_C_OF13/040__vtn_vbrif_audit.robot

diff --git a/test/csit/suites/vtn/VTN_C_OF13/__init__.robot b/csit/suites/vtn/VTN_C_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_C_OF13/__init__.robot
rename to csit/suites/vtn/VTN_C_OF13/__init__.robot

diff --git a/test/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot
rename to csit/suites/vtn/VTN_Mgr_OF10/010__vtn_manager.robot

diff --git a/test/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_Mgr_OF10/__init__.robot
rename to csit/suites/vtn/VTN_Mgr_OF10/__init__.robot

diff --git a/test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.robot
rename to csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager.robot

diff --git a/test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot b/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot
rename to csit/suites/vtn/VTN_Mgr_OF13/010__vtn_manager_flowfilter.robot

diff --git a/test/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot b/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
similarity index 100%
rename from test/csit/suites/vtn/VTN_Mgr_OF13/__init__.robot
rename to csit/suites/vtn/VTN_Mgr_OF13/__init__.robot

diff --git a/test/csit/testplans/aaa-authn.txt b/csit/testplans/aaa-authn.txt
similarity index 100%
rename from test/csit/testplans/aaa-authn.txt
rename to csit/testplans/aaa-authn.txt

diff --git a/test/csit/testplans/bgpcep-userfeatures.txt b/csit/testplans/bgpcep-userfeatures.txt
similarity index 100%
rename from test/csit/testplans/bgpcep-userfeatures.txt
rename to csit/testplans/bgpcep-userfeatures.txt

diff --git a/test/csit/testplans/capwap-ac.txt b/csit/testplans/capwap-ac.txt
similarity index 100%
rename from test/csit/testplans/capwap-ac.txt
rename to csit/testplans/capwap-ac.txt

diff --git a/test/csit/testplans/controller-clustering.txt b/csit/testplans/controller-clustering.txt
similarity index 100%
rename from test/csit/testplans/controller-clustering.txt
rename to csit/testplans/controller-clustering.txt

diff --git a/test/csit/testplans/controller-netconf.txt b/csit/testplans/controller-netconf.txt
similarity index 100%
rename from test/csit/testplans/controller-netconf.txt
rename to csit/testplans/controller-netconf.txt

diff --git a/test/csit/testplans/didm-basic.txt b/csit/testplans/didm-basic.txt
similarity index 100%
rename from test/csit/testplans/didm-basic.txt
rename to csit/testplans/didm-basic.txt

diff --git a/test/csit/testplans/groupbasedpolicy-clustering.txt b/csit/testplans/groupbasedpolicy-clustering.txt
similarity index 100%
rename from test/csit/testplans/groupbasedpolicy-clustering.txt
rename to csit/testplans/groupbasedpolicy-clustering.txt

diff --git a/test/csit/testplans/integration-basic.txt b/csit/testplans/integration-basic.txt
similarity index 100%
rename from test/csit/testplans/integration-basic.txt
rename to csit/testplans/integration-basic.txt

diff --git a/test/csit/testplans/iotdm-basic.txt b/csit/testplans/iotdm-basic.txt
similarity index 100%
rename from test/csit/testplans/iotdm-basic.txt
rename to csit/testplans/iotdm-basic.txt

diff --git a/test/csit/testplans/l2switch-host-scalability-daily.txt b/csit/testplans/l2switch-host-scalability-daily.txt
similarity index 100%
rename from test/csit/testplans/l2switch-host-scalability-daily.txt
rename to csit/testplans/l2switch-host-scalability-daily.txt

diff --git a/test/csit/testplans/l2switch-scalability.txt b/csit/testplans/l2switch-scalability.txt
similarity index 100%
rename from test/csit/testplans/l2switch-scalability.txt
rename to csit/testplans/l2switch-scalability.txt

diff --git a/test/csit/testplans/l2switch-switch.txt b/csit/testplans/l2switch-switch.txt
similarity index 100%
rename from test/csit/testplans/l2switch-switch.txt
rename to csit/testplans/l2switch-switch.txt

diff --git a/test/csit/testplans/lacp-lacp.txt b/csit/testplans/lacp-lacp.txt
similarity index 100%
rename from test/csit/testplans/lacp-lacp.txt
rename to csit/testplans/lacp-lacp.txt

diff --git a/test/csit/testplans/lispflowmapping-all.txt b/csit/testplans/lispflowmapping-all.txt
similarity index 100%
rename from test/csit/testplans/lispflowmapping-all.txt
rename to csit/testplans/lispflowmapping-all.txt

diff --git a/test/csit/testplans/nic-basic.txt b/csit/testplans/nic-basic.txt
similarity index 100%
rename from test/csit/testplans/nic-basic.txt
rename to csit/testplans/nic-basic.txt

diff --git a/test/csit/testplans/nic-vtnrenderer.txt b/csit/testplans/nic-vtnrenderer.txt
similarity index 100%
rename from test/csit/testplans/nic-vtnrenderer.txt
rename to csit/testplans/nic-vtnrenderer.txt

diff --git a/test/csit/testplans/openflowplugin-bulk-matic-ds-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-bulk-matic-ds-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-bulk-matic-ds-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-bulk-matic-ds-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-bulk-matic-ds-daily.txt b/csit/testplans/openflowplugin-bulk-matic-ds-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-bulk-matic-ds-daily.txt
rename to csit/testplans/openflowplugin-bulk-matic-ds-daily.txt

diff --git a/test/csit/testplans/openflowplugin-cbench-daily.txt b/csit/testplans/openflowplugin-cbench-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-cbench-daily.txt
rename to csit/testplans/openflowplugin-cbench-daily.txt

diff --git a/test/csit/testplans/openflowplugin-cbench-performance-lithium-redesign.txt b/csit/testplans/openflowplugin-cbench-performance-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-cbench-performance-lithium-redesign.txt
rename to csit/testplans/openflowplugin-cbench-performance-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-cbench-performance.txt b/csit/testplans/openflowplugin-cbench-performance.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-cbench-performance.txt
rename to csit/testplans/openflowplugin-cbench-performance.txt

diff --git a/test/csit/testplans/openflowplugin-clustering.txt b/csit/testplans/openflowplugin-clustering.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-clustering.txt
rename to csit/testplans/openflowplugin-clustering.txt

diff --git a/test/csit/testplans/openflowplugin-config-performance-lithium-redesign.txt b/csit/testplans/openflowplugin-config-performance-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-config-performance-lithium-redesign.txt
rename to csit/testplans/openflowplugin-config-performance-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-config-performance.txt b/csit/testplans/openflowplugin-config-performance.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-config-performance.txt
rename to csit/testplans/openflowplugin-config-performance.txt

diff --git a/test/csit/testplans/openflowplugin-flow-services-lithium-redesign.txt b/csit/testplans/openflowplugin-flow-services-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-flow-services-lithium-redesign.txt
rename to csit/testplans/openflowplugin-flow-services-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-flow-services-more-lithium-redesign.txt b/csit/testplans/openflowplugin-flow-services-more-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-flow-services-more-lithium-redesign.txt
rename to csit/testplans/openflowplugin-flow-services-more-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-flow-services-more.txt b/csit/testplans/openflowplugin-flow-services-more.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-flow-services-more.txt
rename to csit/testplans/openflowplugin-flow-services-more.txt

diff --git a/test/csit/testplans/openflowplugin-flow-services.txt b/csit/testplans/openflowplugin-flow-services.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-flow-services.txt
rename to csit/testplans/openflowplugin-flow-services.txt

diff --git a/test/csit/testplans/openflowplugin-link-scalability-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-link-scalability-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-link-scalability-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-link-scalability-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-link-scalability-daily.txt b/csit/testplans/openflowplugin-link-scalability-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-link-scalability-daily.txt
rename to csit/testplans/openflowplugin-link-scalability-daily.txt

diff --git a/test/csit/testplans/openflowplugin-longevity-lithium-redesign.txt b/csit/testplans/openflowplugin-longevity-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-longevity-lithium-redesign.txt
rename to csit/testplans/openflowplugin-longevity-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-longevity.txt b/csit/testplans/openflowplugin-longevity.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-longevity.txt
rename to csit/testplans/openflowplugin-longevity.txt

diff --git a/test/csit/testplans/openflowplugin-rpc-time-measure-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-rpc-time-measure-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-rpc-time-measure-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-rpc-time-measure-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-rpc-time-measure-daily.txt b/csit/testplans/openflowplugin-rpc-time-measure-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-rpc-time-measure-daily.txt
rename to csit/testplans/openflowplugin-rpc-time-measure-daily.txt

diff --git a/test/csit/testplans/openflowplugin-scalability-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-scalability-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scalability-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-scalability-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-scalability-daily.txt b/csit/testplans/openflowplugin-scalability-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scalability-daily.txt
rename to csit/testplans/openflowplugin-scalability-daily.txt

diff --git a/test/csit/testplans/openflowplugin-scalability-lithium-redesign.txt b/csit/testplans/openflowplugin-scalability-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scalability-lithium-redesign.txt
rename to csit/testplans/openflowplugin-scalability-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-scalability.txt b/csit/testplans/openflowplugin-scalability.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scalability.txt
rename to csit/testplans/openflowplugin-scalability.txt

diff --git a/test/csit/testplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-scale-stats-collection-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-scale-stats-collection-daily.txt b/csit/testplans/openflowplugin-scale-stats-collection-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-scale-stats-collection-daily.txt
rename to csit/testplans/openflowplugin-scale-stats-collection-daily.txt

diff --git a/test/csit/testplans/openflowplugin-statistics-basic-lithium-redesign.txt b/csit/testplans/openflowplugin-statistics-basic-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-statistics-basic-lithium-redesign.txt
rename to csit/testplans/openflowplugin-statistics-basic-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-stats-manager.txt b/csit/testplans/openflowplugin-stats-manager.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-stats-manager.txt
rename to csit/testplans/openflowplugin-stats-manager.txt

diff --git a/test/csit/testplans/openflowplugin-sw-scalability-daily-lithium-redesign.txt b/csit/testplans/openflowplugin-sw-scalability-daily-lithium-redesign.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-sw-scalability-daily-lithium-redesign.txt
rename to csit/testplans/openflowplugin-sw-scalability-daily-lithium-redesign.txt

diff --git a/test/csit/testplans/openflowplugin-sw-scalability-daily.txt b/csit/testplans/openflowplugin-sw-scalability-daily.txt
similarity index 100%
rename from test/csit/testplans/openflowplugin-sw-scalability-daily.txt
rename to csit/testplans/openflowplugin-sw-scalability-daily.txt

diff --git a/test/csit/testplans/ovsdb-netvirt.txt b/csit/testplans/ovsdb-netvirt.txt
similarity index 100%
rename from test/csit/testplans/ovsdb-netvirt.txt
rename to csit/testplans/ovsdb-netvirt.txt

diff --git a/test/csit/testplans/ovsdb-southbound.txt b/csit/testplans/ovsdb-southbound.txt
similarity index 100%
rename from test/csit/testplans/ovsdb-southbound.txt
rename to csit/testplans/ovsdb-southbound.txt

diff --git a/test/csit/testplans/packetcable-pcmm.txt b/csit/testplans/packetcable-pcmm.txt
similarity index 100%
rename from test/csit/testplans/packetcable-pcmm.txt
rename to csit/testplans/packetcable-pcmm.txt

diff --git a/test/csit/testplans/persistence-basic.txt b/csit/testplans/persistence-basic.txt
similarity index 100%
rename from test/csit/testplans/persistence-basic.txt
rename to csit/testplans/persistence-basic.txt

diff --git a/test/csit/testplans/sfc-clustering.txt b/csit/testplans/sfc-clustering.txt
similarity index 100%
rename from test/csit/testplans/sfc-clustering.txt
rename to csit/testplans/sfc-clustering.txt

diff --git a/test/csit/testplans/snmp-basic.txt b/csit/testplans/snmp-basic.txt
similarity index 100%
rename from test/csit/testplans/snmp-basic.txt
rename to csit/testplans/snmp-basic.txt

diff --git a/test/csit/testplans/tsdr-h2-datastore.txt b/csit/testplans/tsdr-h2-datastore.txt
similarity index 100%
rename from test/csit/testplans/tsdr-h2-datastore.txt
rename to csit/testplans/tsdr-h2-datastore.txt

diff --git a/test/csit/testplans/tsdr-hbase-datastore.txt b/csit/testplans/tsdr-hbase-datastore.txt
similarity index 100%
rename from test/csit/testplans/tsdr-hbase-datastore.txt
rename to csit/testplans/tsdr-hbase-datastore.txt

diff --git a/test/csit/testplans/usc-channel.txt b/csit/testplans/usc-channel.txt
similarity index 100%
rename from test/csit/testplans/usc-channel.txt
rename to csit/testplans/usc-channel.txt

diff --git a/test/csit/testplans/vpnservice-vpnservice.txt b/csit/testplans/vpnservice-vpnservice.txt
similarity index 100%
rename from test/csit/testplans/vpnservice-vpnservice.txt
rename to csit/testplans/vpnservice-vpnservice.txt

diff --git a/test/csit/testplans/vpnservice.txt b/csit/testplans/vpnservice.txt
similarity index 100%
rename from test/csit/testplans/vpnservice.txt
rename to csit/testplans/vpnservice.txt

diff --git a/test/csit/testplans/vtn-coordinator.txt b/csit/testplans/vtn-coordinator.txt
similarity index 100%
rename from test/csit/testplans/vtn-coordinator.txt
rename to csit/testplans/vtn-coordinator.txt

diff --git a/test/csit/testplans/vtn-manager.txt b/csit/testplans/vtn-manager.txt
similarity index 100%
rename from test/csit/testplans/vtn-manager.txt
rename to csit/testplans/vtn-manager.txt

diff --git a/test/csit/variables/Variables.py b/csit/variables/Variables.py
similarity index 100%
rename from test/csit/variables/Variables.py
rename to csit/variables/Variables.py

diff --git a/test/csit/variables/bgpuser/bgp_peer/config.uri b/csit/variables/bgpuser/bgp_peer/config.uri
similarity index 100%
rename from test/csit/variables/bgpuser/bgp_peer/config.uri
rename to csit/variables/bgpuser/bgp_peer/config.uri

diff --git a/test/csit/variables/bgpuser/bgp_peer/data.xml b/csit/variables/bgpuser/bgp_peer/data.xml
similarity index 100%
rename from test/csit/variables/bgpuser/bgp_peer/data.xml
rename to csit/variables/bgpuser/bgp_peer/data.xml

diff --git a/test/csit/variables/bgpuser/empty.json b/csit/variables/bgpuser/empty.json
similarity index 100%
rename from test/csit/variables/bgpuser/empty.json
rename to csit/variables/bgpuser/empty.json

diff --git a/test/csit/variables/bgpuser/filled.json b/csit/variables/bgpuser/filled.json
similarity index 100%
rename from test/csit/variables/bgpuser/filled.json
rename to csit/variables/bgpuser/filled.json

diff --git a/test/csit/variables/bgpuser/variables.py b/csit/variables/bgpuser/variables.py
similarity index 100%
rename from test/csit/variables/bgpuser/variables.py
rename to csit/variables/bgpuser/variables.py

diff --git a/test/csit/variables/gbp/register-endpoint.json b/csit/variables/gbp/register-endpoint.json
similarity index 100%
rename from test/csit/variables/gbp/register-endpoint.json
rename to csit/variables/gbp/register-endpoint.json

diff --git a/test/csit/variables/gbp/tenant1.json b/csit/variables/gbp/tenant1.json
similarity index 100%
rename from test/csit/variables/gbp/tenant1.json
rename to csit/variables/gbp/tenant1.json

diff --git a/test/csit/variables/gbp/tenants.json b/csit/variables/gbp/tenants.json
similarity index 100%
rename from test/csit/variables/gbp/tenants.json
rename to csit/variables/gbp/tenants.json

diff --git a/test/csit/variables/gbp/tunnel1.json b/csit/variables/gbp/tunnel1.json
similarity index 100%
rename from test/csit/variables/gbp/tunnel1.json
rename to csit/variables/gbp/tunnel1.json

diff --git a/test/csit/variables/gbp/tunnels.json b/csit/variables/gbp/tunnels.json
similarity index 100%
rename from test/csit/variables/gbp/tunnels.json
rename to csit/variables/gbp/tunnels.json

diff --git a/test/csit/variables/gbp/unregister-endpoint.json b/csit/variables/gbp/unregister-endpoint.json
similarity index 100%
rename from test/csit/variables/gbp/unregister-endpoint.json
rename to csit/variables/gbp/unregister-endpoint.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-key_ipv4.json b/csit/variables/lispflowmapping/rpc_add-key_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-key_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-key_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_as_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_as_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_as_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_as_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_dn_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_dn_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_dn_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_dn_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_iid_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_iid_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_iid_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_iid_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_appdata.json b/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_appdata.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_appdata.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_ipv4_appdata.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_elp.json b/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_elp.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_elp.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_ipv4_elp.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_ipv4_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_list.json b/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_list.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_ipv4_list.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_ipv4_list.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_ipv6_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_ipv6_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_ipv6_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_ipv6_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_kv_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_kv_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_kv_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_kv_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_mac_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_mac_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_mac_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_mac_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_add-mapping_srcdst_ipv4.json b/csit/variables/lispflowmapping/rpc_add-mapping_srcdst_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_add-mapping_srcdst_ipv4.json
rename to csit/variables/lispflowmapping/rpc_add-mapping_srcdst_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_as.json b/csit/variables/lispflowmapping/rpc_get-remove_as.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_as.json
rename to csit/variables/lispflowmapping/rpc_get-remove_as.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_dn.json b/csit/variables/lispflowmapping/rpc_get-remove_dn.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_dn.json
rename to csit/variables/lispflowmapping/rpc_get-remove_dn.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_iid.json b/csit/variables/lispflowmapping/rpc_get-remove_iid.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_iid.json
rename to csit/variables/lispflowmapping/rpc_get-remove_iid.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_ipv4.json b/csit/variables/lispflowmapping/rpc_get-remove_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_ipv4.json
rename to csit/variables/lispflowmapping/rpc_get-remove_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_ipv6.json b/csit/variables/lispflowmapping/rpc_get-remove_ipv6.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_ipv6.json
rename to csit/variables/lispflowmapping/rpc_get-remove_ipv6.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_kv.json b/csit/variables/lispflowmapping/rpc_get-remove_kv.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_kv.json
rename to csit/variables/lispflowmapping/rpc_get-remove_kv.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_mac.json b/csit/variables/lispflowmapping/rpc_get-remove_mac.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_mac.json
rename to csit/variables/lispflowmapping/rpc_get-remove_mac.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_missing.json b/csit/variables/lispflowmapping/rpc_get-remove_missing.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_missing.json
rename to csit/variables/lispflowmapping/rpc_get-remove_missing.json

diff --git a/test/csit/variables/lispflowmapping/rpc_get-remove_srcdst.json b/csit/variables/lispflowmapping/rpc_get-remove_srcdst.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_get-remove_srcdst.json
rename to csit/variables/lispflowmapping/rpc_get-remove_srcdst.json

diff --git a/test/csit/variables/lispflowmapping/rpc_update-key_ipv4.json b/csit/variables/lispflowmapping/rpc_update-key_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_update-key_ipv4.json
rename to csit/variables/lispflowmapping/rpc_update-key_ipv4.json

diff --git a/test/csit/variables/lispflowmapping/rpc_update-mapping_ipv4_ipv4.json b/csit/variables/lispflowmapping/rpc_update-mapping_ipv4_ipv4.json
similarity index 100%
rename from test/csit/variables/lispflowmapping/rpc_update-mapping_ipv4_ipv4.json
rename to csit/variables/lispflowmapping/rpc_update-mapping_ipv4_ipv4.json

diff --git a/test/csit/variables/ofplugin/RpcVariables.py b/csit/variables/ofplugin/RpcVariables.py
similarity index 100%
rename from test/csit/variables/ofplugin/RpcVariables.py
rename to csit/variables/ofplugin/RpcVariables.py

diff --git a/test/csit/variables/ovsdb/add_flow_rule1.xml b/csit/variables/ovsdb/add_flow_rule1.xml
similarity index 100%
rename from test/csit/variables/ovsdb/add_flow_rule1.xml
rename to csit/variables/ovsdb/add_flow_rule1.xml

diff --git a/test/csit/variables/ovsdb/add_flow_rule2.xml b/csit/variables/ovsdb/add_flow_rule2.xml
similarity index 100%
rename from test/csit/variables/ovsdb/add_flow_rule2.xml
rename to csit/variables/ovsdb/add_flow_rule2.xml

diff --git a/test/csit/variables/ovsdb/add_flow_rule3.xml b/csit/variables/ovsdb/add_flow_rule3.xml
similarity index 100%
rename from test/csit/variables/ovsdb/add_flow_rule3.xml
rename to csit/variables/ovsdb/add_flow_rule3.xml

diff --git a/test/csit/variables/ovsdb/add_flow_rule4.xml b/csit/variables/ovsdb/add_flow_rule4.xml
similarity index 100%
rename from test/csit/variables/ovsdb/add_flow_rule4.xml
rename to csit/variables/ovsdb/add_flow_rule4.xml

diff --git a/test/csit/variables/ovsdb/associate_floating_ip.json b/csit/variables/ovsdb/associate_floating_ip.json
similarity index 100%
rename from test/csit/variables/ovsdb/associate_floating_ip.json
rename to csit/variables/ovsdb/associate_floating_ip.json

diff --git a/test/csit/variables/ovsdb/connect.json b/csit/variables/ovsdb/connect.json
similarity index 100%
rename from test/csit/variables/ovsdb/connect.json
rename to csit/variables/ovsdb/connect.json

diff --git a/test/csit/variables/ovsdb/create_bridge.json b/csit/variables/ovsdb/create_bridge.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_bridge.json
rename to csit/variables/ovsdb/create_bridge.json

diff --git a/test/csit/variables/ovsdb/create_ext_net.json b/csit/variables/ovsdb/create_ext_net.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_ext_net.json
rename to csit/variables/ovsdb/create_ext_net.json

diff --git a/test/csit/variables/ovsdb/create_ext_subnet.json b/csit/variables/ovsdb/create_ext_subnet.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_ext_subnet.json
rename to csit/variables/ovsdb/create_ext_subnet.json

diff --git a/test/csit/variables/ovsdb/create_floating_ip.json b/csit/variables/ovsdb/create_floating_ip.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_floating_ip.json
rename to csit/variables/ovsdb/create_floating_ip.json

diff --git a/test/csit/variables/ovsdb/create_port.json b/csit/variables/ovsdb/create_port.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port.json
rename to csit/variables/ovsdb/create_port.json

diff --git a/test/csit/variables/ovsdb/create_port_dhcp.json b/csit/variables/ovsdb/create_port_dhcp.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_dhcp.json
rename to csit/variables/ovsdb/create_port_dhcp.json

diff --git a/test/csit/variables/ovsdb/create_port_floating_ip.json b/csit/variables/ovsdb/create_port_floating_ip.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_floating_ip.json
rename to csit/variables/ovsdb/create_port_floating_ip.json

diff --git a/test/csit/variables/ovsdb/create_port_key.json b/csit/variables/ovsdb/create_port_key.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_key.json
rename to csit/variables/ovsdb/create_port_key.json

diff --git a/test/csit/variables/ovsdb/create_port_rtr_gateway.json b/csit/variables/ovsdb/create_port_rtr_gateway.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_rtr_gateway.json
rename to csit/variables/ovsdb/create_port_rtr_gateway.json

diff --git a/test/csit/variables/ovsdb/create_port_rtr_interface.json b/csit/variables/ovsdb/create_port_rtr_interface.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_rtr_interface.json
rename to csit/variables/ovsdb/create_port_rtr_interface.json

diff --git a/test/csit/variables/ovsdb/create_port_vm.json b/csit/variables/ovsdb/create_port_vm.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_port_vm.json
rename to csit/variables/ovsdb/create_port_vm.json

diff --git a/test/csit/variables/ovsdb/create_router.json b/csit/variables/ovsdb/create_router.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_router.json
rename to csit/variables/ovsdb/create_router.json

diff --git a/test/csit/variables/ovsdb/create_tnt_net.json b/csit/variables/ovsdb/create_tnt_net.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_tnt_net.json
rename to csit/variables/ovsdb/create_tnt_net.json

diff --git a/test/csit/variables/ovsdb/create_tnt_subnet.json b/csit/variables/ovsdb/create_tnt_subnet.json
similarity index 100%
rename from test/csit/variables/ovsdb/create_tnt_subnet.json
rename to csit/variables/ovsdb/create_tnt_subnet.json

diff --git a/test/csit/variables/ovsdb/ovsdb.py b/csit/variables/ovsdb/ovsdb.py
similarity index 100%
rename from test/csit/variables/ovsdb/ovsdb.py
rename to csit/variables/ovsdb/ovsdb.py

diff --git a/test/csit/variables/ovsdb/update_port_dhcp.json b/csit/variables/ovsdb/update_port_dhcp.json
similarity index 100%
rename from test/csit/variables/ovsdb/update_port_dhcp.json
rename to csit/variables/ovsdb/update_port_dhcp.json

diff --git a/test/csit/variables/ovsdb/update_router_interface.json b/csit/variables/ovsdb/update_router_interface.json
similarity index 100%
rename from test/csit/variables/ovsdb/update_router_interface.json
rename to csit/variables/ovsdb/update_router_interface.json

diff --git a/test/csit/variables/ovsdb/update_router_port_gateway.json b/csit/variables/ovsdb/update_router_port_gateway.json
similarity index 100%
rename from test/csit/variables/ovsdb/update_router_port_gateway.json
rename to csit/variables/ovsdb/update_router_port_gateway.json

diff --git a/test/csit/variables/packetcable/add_ccap.json b/csit/variables/packetcable/add_ccap.json
similarity index 100%
rename from test/csit/variables/packetcable/add_ccap.json
rename to csit/variables/packetcable/add_ccap.json

diff --git a/test/csit/variables/packetcable/add_multi_ccaps.json b/csit/variables/packetcable/add_multi_ccaps.json
similarity index 100%
rename from test/csit/variables/packetcable/add_multi_ccaps.json
rename to csit/variables/packetcable/add_multi_ccaps.json

diff --git a/test/csit/variables/pcepuser/variables.py b/csit/variables/pcepuser/variables.py
similarity index 100%
rename from test/csit/variables/pcepuser/variables.py
rename to csit/variables/pcepuser/variables.py

diff --git a/test/csit/variables/sfc/service-function-chains.json b/csit/variables/sfc/service-function-chains.json
similarity index 100%
rename from test/csit/variables/sfc/service-function-chains.json
rename to csit/variables/sfc/service-function-chains.json

diff --git a/test/csit/variables/sfc/service-function-forwarders.json b/csit/variables/sfc/service-function-forwarders.json
similarity index 100%
rename from test/csit/variables/sfc/service-function-forwarders.json
rename to csit/variables/sfc/service-function-forwarders.json

diff --git a/test/csit/variables/sfc/service-function-paths.json b/csit/variables/sfc/service-function-paths.json
similarity index 100%
rename from test/csit/variables/sfc/service-function-paths.json
rename to csit/variables/sfc/service-function-paths.json

diff --git a/test/csit/variables/sfc/service-functions.json b/csit/variables/sfc/service-functions.json
similarity index 100%
rename from test/csit/variables/sfc/service-functions.json
rename to csit/variables/sfc/service-functions.json

diff --git a/test/csit/variables/sfc/service-loadbalance-schedule-type.json b/csit/variables/sfc/service-loadbalance-schedule-type.json
similarity index 100%
rename from test/csit/variables/sfc/service-loadbalance-schedule-type.json
rename to csit/variables/sfc/service-loadbalance-schedule-type.json

diff --git a/test/csit/variables/sfc/service-nodes.json b/csit/variables/sfc/service-nodes.json
similarity index 100%
rename from test/csit/variables/sfc/service-nodes.json
rename to csit/variables/sfc/service-nodes.json

diff --git a/test/csit/variables/sfc/service-random-schedule-type.json b/csit/variables/sfc/service-random-schedule-type.json
similarity index 100%
rename from test/csit/variables/sfc/service-random-schedule-type.json
rename to csit/variables/sfc/service-random-schedule-type.json

diff --git a/test/csit/variables/sfc/service-roundrobin-schedule-type.json b/csit/variables/sfc/service-roundrobin-schedule-type.json
similarity index 100%
rename from test/csit/variables/sfc/service-roundrobin-schedule-type.json
rename to csit/variables/sfc/service-roundrobin-schedule-type.json

diff --git a/test/csit/variables/sfc/service-schedule-types.json b/csit/variables/sfc/service-schedule-types.json
similarity index 100%
rename from test/csit/variables/sfc/service-schedule-types.json
rename to csit/variables/sfc/service-schedule-types.json

diff --git a/test/csit/variables/sfc/service-shortestpath-schedule-type.json b/csit/variables/sfc/service-shortestpath-schedule-type.json
similarity index 100%
rename from test/csit/variables/sfc/service-shortestpath-schedule-type.json
rename to csit/variables/sfc/service-shortestpath-schedule-type.json

diff --git a/test/csit/variables/sfc/service-wsp-schedule-type.json b/csit/variables/sfc/service-wsp-schedule-type.json
similarity index 100%
rename from test/csit/variables/sfc/service-wsp-schedule-type.json
rename to csit/variables/sfc/service-wsp-schedule-type.json

diff --git a/test/csit/variables/sfc/sf_dpi_102_100.json b/csit/variables/sfc/sf_dpi_102_100.json
similarity index 100%
rename from test/csit/variables/sfc/sf_dpi_102_100.json
rename to csit/variables/sfc/sf_dpi_102_100.json

diff --git a/test/csit/variables/sfc/sf_dpl_101.json b/csit/variables/sfc/sf_dpl_101.json
similarity index 100%
rename from test/csit/variables/sfc/sf_dpl_101.json
rename to csit/variables/sfc/sf_dpl_101.json

diff --git a/test/csit/variables/sfc/sfc_chain_100.json b/csit/variables/sfc/sfc_chain_100.json
similarity index 100%
rename from test/csit/variables/sfc/sfc_chain_100.json
rename to csit/variables/sfc/sfc_chain_100.json

diff --git a/test/csit/variables/sfc/sfc_chain_100_sfids.json b/csit/variables/sfc/sfc_chain_100_sfids.json
similarity index 100%
rename from test/csit/variables/sfc/sfc_chain_100_sfids.json
rename to csit/variables/sfc/sfc_chain_100_sfids.json

diff --git a/test/csit/variables/sfc/sff_csd_locator.json b/csit/variables/sfc/sff_csd_locator.json
similarity index 100%
rename from test/csit/variables/sfc/sff_csd_locator.json
rename to csit/variables/sfc/sff_csd_locator.json

diff --git a/test/csit/variables/sfc/sff_csd_sff100.json b/csit/variables/sfc/sff_csd_sff100.json
similarity index 100%
rename from test/csit/variables/sfc/sff_csd_sff100.json
rename to csit/variables/sfc/sff_csd_sff100.json

diff --git a/test/csit/variables/sfc/sff_dpl_101.json b/csit/variables/sfc/sff_dpl_101.json
similarity index 100%
rename from test/csit/variables/sfc/sff_dpl_101.json
rename to csit/variables/sfc/sff_dpl_101.json

diff --git a/test/csit/variables/sfc/sff_dpl_locator.json b/csit/variables/sfc/sff_dpl_locator.json
similarity index 100%
rename from test/csit/variables/sfc/sff_dpl_locator.json
rename to csit/variables/sfc/sff_dpl_locator.json

diff --git a/test/csit/variables/sfc/sff_ovs_100.json b/csit/variables/sfc/sff_ovs_100.json
similarity index 100%
rename from test/csit/variables/sfc/sff_ovs_100.json
rename to csit/variables/sfc/sff_ovs_100.json

diff --git a/test/csit/variables/sfc/sff_sfd_locator.json b/csit/variables/sfc/sff_sfd_locator.json
similarity index 100%
rename from test/csit/variables/sfc/sff_sfd_locator.json
rename to csit/variables/sfc/sff_sfd_locator.json

diff --git a/test/csit/variables/sfc/sff_sfd_sf100.json b/csit/variables/sfc/sff_sfd_sf100.json
similarity index 100%
rename from test/csit/variables/sfc/sff_sfd_sf100.json
rename to csit/variables/sfc/sff_sfd_sf100.json

diff --git a/test/csit/variables/sfc/sfp_sfc1_path400.json b/csit/variables/sfc/sfp_sfc1_path400.json
similarity index 100%
rename from test/csit/variables/sfc/sfp_sfc1_path400.json
rename to csit/variables/sfc/sfp_sfc1_path400.json

diff --git a/test/csit/variables/sfc/sn_node_100.json b/csit/variables/sfc/sn_node_100.json
similarity index 100%
rename from test/csit/variables/sfc/sn_node_100.json
rename to csit/variables/sfc/sn_node_100.json

diff --git a/test/csit/variables/tcpmd5user/key_access_module/config.uri b/csit/variables/tcpmd5user/key_access_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/key_access_module/config.uri
rename to csit/variables/tcpmd5user/key_access_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/key_access_module/data.xml b/csit/variables/tcpmd5user/key_access_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/key_access_module/data.xml
rename to csit/variables/tcpmd5user/key_access_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/key_access_service/config.uri b/csit/variables/tcpmd5user/key_access_service/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/key_access_service/config.uri
rename to csit/variables/tcpmd5user/key_access_service/config.uri

diff --git a/test/csit/variables/tcpmd5user/key_access_service/data.xml b/csit/variables/tcpmd5user/key_access_service/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/key_access_service/data.xml
rename to csit/variables/tcpmd5user/key_access_service/data.xml

diff --git a/test/csit/variables/tcpmd5user/md5_client_channel_module/config.uri b/csit/variables/tcpmd5user/md5_client_channel_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_client_channel_module/config.uri
rename to csit/variables/tcpmd5user/md5_client_channel_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/md5_client_channel_module/data.xml b/csit/variables/tcpmd5user/md5_client_channel_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_client_channel_module/data.xml
rename to csit/variables/tcpmd5user/md5_client_channel_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/md5_client_channel_service/config.uri b/csit/variables/tcpmd5user/md5_client_channel_service/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_client_channel_service/config.uri
rename to csit/variables/tcpmd5user/md5_client_channel_service/config.uri

diff --git a/test/csit/variables/tcpmd5user/md5_client_channel_service/data.xml b/csit/variables/tcpmd5user/md5_client_channel_service/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_client_channel_service/data.xml
rename to csit/variables/tcpmd5user/md5_client_channel_service/data.xml

diff --git a/test/csit/variables/tcpmd5user/md5_server_channel_module/config.uri b/csit/variables/tcpmd5user/md5_server_channel_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_server_channel_module/config.uri
rename to csit/variables/tcpmd5user/md5_server_channel_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/md5_server_channel_module/data.xml b/csit/variables/tcpmd5user/md5_server_channel_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_server_channel_module/data.xml
rename to csit/variables/tcpmd5user/md5_server_channel_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/md5_server_channel_service/config.uri b/csit/variables/tcpmd5user/md5_server_channel_service/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_server_channel_service/config.uri
rename to csit/variables/tcpmd5user/md5_server_channel_service/config.uri

diff --git a/test/csit/variables/tcpmd5user/md5_server_channel_service/data.xml b/csit/variables/tcpmd5user/md5_server_channel_service/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/md5_server_channel_service/data.xml
rename to csit/variables/tcpmd5user/md5_server_channel_service/data.xml

diff --git a/test/csit/variables/tcpmd5user/pcep_client_channel_module/config.uri b/csit/variables/tcpmd5user/pcep_client_channel_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_client_channel_module/config.uri
rename to csit/variables/tcpmd5user/pcep_client_channel_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml b/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_client_channel_module/data.xml
rename to csit/variables/tcpmd5user/pcep_client_channel_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/pcep_server_channel_module/config.uri b/csit/variables/tcpmd5user/pcep_server_channel_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_server_channel_module/config.uri
rename to csit/variables/tcpmd5user/pcep_server_channel_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml b/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_server_channel_module/data.xml
rename to csit/variables/tcpmd5user/pcep_server_channel_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/pcep_topology_client_module/config.uri b/csit/variables/tcpmd5user/pcep_topology_client_module/config.uri
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_topology_client_module/config.uri
rename to csit/variables/tcpmd5user/pcep_topology_client_module/config.uri

diff --git a/test/csit/variables/tcpmd5user/pcep_topology_client_module/data.xml b/csit/variables/tcpmd5user/pcep_topology_client_module/data.xml
similarity index 100%
rename from test/csit/variables/tcpmd5user/pcep_topology_client_module/data.xml
rename to csit/variables/tcpmd5user/pcep_topology_client_module/data.xml

diff --git a/test/csit/variables/tcpmd5user/variables.py b/csit/variables/tcpmd5user/variables.py
similarity index 100%
rename from test/csit/variables/tcpmd5user/variables.py
rename to csit/variables/tcpmd5user/variables.py

diff --git a/test/csit/variables/vpnservice/Variables.py b/csit/variables/vpnservice/Variables.py
similarity index 100%
rename from test/csit/variables/vpnservice/Variables.py
rename to csit/variables/vpnservice/Variables.py

diff --git a/test/csit/variables/vpnservice/bgp_neighbor.json b/csit/variables/vpnservice/bgp_neighbor.json
similarity index 100%
rename from test/csit/variables/vpnservice/bgp_neighbor.json
rename to csit/variables/vpnservice/bgp_neighbor.json

diff --git a/test/csit/variables/vpnservice/bgp_router.json b/csit/variables/vpnservice/bgp_router.json
similarity index 100%
rename from test/csit/variables/vpnservice/bgp_router.json
rename to csit/variables/vpnservice/bgp_router.json

diff --git a/test/csit/variables/vpnservice/configureSwitches.py b/csit/variables/vpnservice/configureSwitches.py
similarity index 100%
rename from test/csit/variables/vpnservice/configureSwitches.py
rename to csit/variables/vpnservice/configureSwitches.py

diff --git a/test/csit/variables/vpnservice/vm_interface.json b/csit/variables/vpnservice/vm_interface.json
similarity index 100%
rename from test/csit/variables/vpnservice/vm_interface.json
rename to csit/variables/vpnservice/vm_interface.json

diff --git a/test/csit/variables/vpnservice/vm_vpninterface.json b/csit/variables/vpnservice/vm_vpninterface.json
similarity index 100%
rename from test/csit/variables/vpnservice/vm_vpninterface.json
rename to csit/variables/vpnservice/vm_vpninterface.json

diff --git a/test/csit/variables/vpnservice/vpn_instance.json b/csit/variables/vpnservice/vpn_instance.json
similarity index 100%
rename from test/csit/variables/vpnservice/vpn_instance.json
rename to csit/variables/vpnservice/vpn_instance.json

diff --git a/test/csit/variables/xmls/f1.xml b/csit/variables/xmls/f1.xml
similarity index 100%
rename from test/csit/variables/xmls/f1.xml
rename to csit/variables/xmls/f1.xml

diff --git a/test/csit/variables/xmls/f10.xml b/csit/variables/xmls/f10.xml
similarity index 100%
rename from test/csit/variables/xmls/f10.xml
rename to csit/variables/xmls/f10.xml

diff --git a/test/csit/variables/xmls/f101.xml b/csit/variables/xmls/f101.xml
similarity index 100%
rename from test/csit/variables/xmls/f101.xml
rename to csit/variables/xmls/f101.xml

diff --git a/test/csit/variables/xmls/f102.xml b/csit/variables/xmls/f102.xml
similarity index 100%
rename from test/csit/variables/xmls/f102.xml
rename to csit/variables/xmls/f102.xml

diff --git a/test/csit/variables/xmls/f103.xml b/csit/variables/xmls/f103.xml
similarity index 100%
rename from test/csit/variables/xmls/f103.xml
rename to csit/variables/xmls/f103.xml

diff --git a/test/csit/variables/xmls/f104.xml b/csit/variables/xmls/f104.xml
similarity index 100%
rename from test/csit/variables/xmls/f104.xml
rename to csit/variables/xmls/f104.xml

diff --git a/test/csit/variables/xmls/f105.xml b/csit/variables/xmls/f105.xml
similarity index 100%
rename from test/csit/variables/xmls/f105.xml
rename to csit/variables/xmls/f105.xml

diff --git a/test/csit/variables/xmls/f106.xml b/csit/variables/xmls/f106.xml
similarity index 100%
rename from test/csit/variables/xmls/f106.xml
rename to csit/variables/xmls/f106.xml

diff --git a/test/csit/variables/xmls/f107.xml b/csit/variables/xmls/f107.xml
similarity index 100%
rename from test/csit/variables/xmls/f107.xml
rename to csit/variables/xmls/f107.xml

diff --git a/test/csit/variables/xmls/f108.xml b/csit/variables/xmls/f108.xml
similarity index 100%
rename from test/csit/variables/xmls/f108.xml
rename to csit/variables/xmls/f108.xml

diff --git a/test/csit/variables/xmls/f109.xml b/csit/variables/xmls/f109.xml
similarity index 100%
rename from test/csit/variables/xmls/f109.xml
rename to csit/variables/xmls/f109.xml

diff --git a/test/csit/variables/xmls/f11.xml b/csit/variables/xmls/f11.xml
similarity index 100%
rename from test/csit/variables/xmls/f11.xml
rename to csit/variables/xmls/f11.xml

diff --git a/test/csit/variables/xmls/f110.xml b/csit/variables/xmls/f110.xml
similarity index 100%
rename from test/csit/variables/xmls/f110.xml
rename to csit/variables/xmls/f110.xml

diff --git a/test/csit/variables/xmls/f111.xml b/csit/variables/xmls/f111.xml
similarity index 100%
rename from test/csit/variables/xmls/f111.xml
rename to csit/variables/xmls/f111.xml

diff --git a/test/csit/variables/xmls/f112.xml b/csit/variables/xmls/f112.xml
similarity index 100%
rename from test/csit/variables/xmls/f112.xml
rename to csit/variables/xmls/f112.xml

diff --git a/test/csit/variables/xmls/f113.xml b/csit/variables/xmls/f113.xml
similarity index 100%
rename from test/csit/variables/xmls/f113.xml
rename to csit/variables/xmls/f113.xml

diff --git a/test/csit/variables/xmls/f114.xml b/csit/variables/xmls/f114.xml
similarity index 100%
rename from test/csit/variables/xmls/f114.xml
rename to csit/variables/xmls/f114.xml

diff --git a/test/csit/variables/xmls/f12.xml b/csit/variables/xmls/f12.xml
similarity index 100%
rename from test/csit/variables/xmls/f12.xml
rename to csit/variables/xmls/f12.xml

diff --git a/test/csit/variables/xmls/f13.xml b/csit/variables/xmls/f13.xml
similarity index 100%
rename from test/csit/variables/xmls/f13.xml
rename to csit/variables/xmls/f13.xml

diff --git a/test/csit/variables/xmls/f14.xml b/csit/variables/xmls/f14.xml
similarity index 100%
rename from test/csit/variables/xmls/f14.xml
rename to csit/variables/xmls/f14.xml

diff --git a/test/csit/variables/xmls/f15.xml b/csit/variables/xmls/f15.xml
similarity index 100%
rename from test/csit/variables/xmls/f15.xml
rename to csit/variables/xmls/f15.xml

diff --git a/test/csit/variables/xmls/f156.xml b/csit/variables/xmls/f156.xml
similarity index 100%
rename from test/csit/variables/xmls/f156.xml
rename to csit/variables/xmls/f156.xml

diff --git a/test/csit/variables/xmls/f157.xml b/csit/variables/xmls/f157.xml
similarity index 100%
rename from test/csit/variables/xmls/f157.xml
rename to csit/variables/xmls/f157.xml

diff --git a/test/csit/variables/xmls/f158.xml b/csit/variables/xmls/f158.xml
similarity index 100%
rename from test/csit/variables/xmls/f158.xml
rename to csit/variables/xmls/f158.xml

diff --git a/test/csit/variables/xmls/f159.xml b/csit/variables/xmls/f159.xml
similarity index 100%
rename from test/csit/variables/xmls/f159.xml
rename to csit/variables/xmls/f159.xml

diff --git a/test/csit/variables/xmls/f16.xml b/csit/variables/xmls/f16.xml
similarity index 100%
rename from test/csit/variables/xmls/f16.xml
rename to csit/variables/xmls/f16.xml

diff --git a/test/csit/variables/xmls/f160.xml b/csit/variables/xmls/f160.xml
similarity index 100%
rename from test/csit/variables/xmls/f160.xml
rename to csit/variables/xmls/f160.xml

diff --git a/test/csit/variables/xmls/f17.xml b/csit/variables/xmls/f17.xml
similarity index 100%
rename from test/csit/variables/xmls/f17.xml
rename to csit/variables/xmls/f17.xml

diff --git a/test/csit/variables/xmls/f18.xml b/csit/variables/xmls/f18.xml
similarity index 100%
rename from test/csit/variables/xmls/f18.xml
rename to csit/variables/xmls/f18.xml

diff --git a/test/csit/variables/xmls/f19.xml b/csit/variables/xmls/f19.xml
similarity index 100%
rename from test/csit/variables/xmls/f19.xml
rename to csit/variables/xmls/f19.xml

diff --git a/test/csit/variables/xmls/f2.xml b/csit/variables/xmls/f2.xml
similarity index 100%
rename from test/csit/variables/xmls/f2.xml
rename to csit/variables/xmls/f2.xml

diff --git a/test/csit/variables/xmls/f20.xml b/csit/variables/xmls/f20.xml
similarity index 100%
rename from test/csit/variables/xmls/f20.xml
rename to csit/variables/xmls/f20.xml

diff --git a/test/csit/variables/xmls/f201.xml b/csit/variables/xmls/f201.xml
similarity index 100%
rename from test/csit/variables/xmls/f201.xml
rename to csit/variables/xmls/f201.xml

diff --git a/test/csit/variables/xmls/f202.xml b/csit/variables/xmls/f202.xml
similarity index 100%
rename from test/csit/variables/xmls/f202.xml
rename to csit/variables/xmls/f202.xml

diff --git a/test/csit/variables/xmls/f203.xml b/csit/variables/xmls/f203.xml
similarity index 100%
rename from test/csit/variables/xmls/f203.xml
rename to csit/variables/xmls/f203.xml

diff --git a/test/csit/variables/xmls/f204.xml b/csit/variables/xmls/f204.xml
similarity index 100%
rename from test/csit/variables/xmls/f204.xml
rename to csit/variables/xmls/f204.xml

diff --git a/test/csit/variables/xmls/f205.xml b/csit/variables/xmls/f205.xml
similarity index 100%
rename from test/csit/variables/xmls/f205.xml
rename to csit/variables/xmls/f205.xml

diff --git a/test/csit/variables/xmls/f206.xml b/csit/variables/xmls/f206.xml
similarity index 100%
rename from test/csit/variables/xmls/f206.xml
rename to csit/variables/xmls/f206.xml

diff --git a/test/csit/variables/xmls/f207.xml b/csit/variables/xmls/f207.xml
similarity index 100%
rename from test/csit/variables/xmls/f207.xml
rename to csit/variables/xmls/f207.xml

diff --git a/test/csit/variables/xmls/f208.xml b/csit/variables/xmls/f208.xml
similarity index 100%
rename from test/csit/variables/xmls/f208.xml
rename to csit/variables/xmls/f208.xml

diff --git a/test/csit/variables/xmls/f209.xml b/csit/variables/xmls/f209.xml
similarity index 100%
rename from test/csit/variables/xmls/f209.xml
rename to csit/variables/xmls/f209.xml

diff --git a/test/csit/variables/xmls/f21.xml b/csit/variables/xmls/f21.xml
similarity index 100%
rename from test/csit/variables/xmls/f21.xml
rename to csit/variables/xmls/f21.xml

diff --git a/test/csit/variables/xmls/f210.xml b/csit/variables/xmls/f210.xml
similarity index 100%
rename from test/csit/variables/xmls/f210.xml
rename to csit/variables/xmls/f210.xml

diff --git a/test/csit/variables/xmls/f211.xml b/csit/variables/xmls/f211.xml
similarity index 100%
rename from test/csit/variables/xmls/f211.xml
rename to csit/variables/xmls/f211.xml

diff --git a/test/csit/variables/xmls/f212.xml b/csit/variables/xmls/f212.xml
similarity index 100%
rename from test/csit/variables/xmls/f212.xml
rename to csit/variables/xmls/f212.xml

diff --git a/test/csit/variables/xmls/f213.xml b/csit/variables/xmls/f213.xml
similarity index 100%
rename from test/csit/variables/xmls/f213.xml
rename to csit/variables/xmls/f213.xml

diff --git a/test/csit/variables/xmls/f214.xml b/csit/variables/xmls/f214.xml
similarity index 100%
rename from test/csit/variables/xmls/f214.xml
rename to csit/variables/xmls/f214.xml

diff --git a/test/csit/variables/xmls/f215.xml b/csit/variables/xmls/f215.xml
similarity index 100%
rename from test/csit/variables/xmls/f215.xml
rename to csit/variables/xmls/f215.xml

diff --git a/test/csit/variables/xmls/f216.xml b/csit/variables/xmls/f216.xml
similarity index 100%
rename from test/csit/variables/xmls/f216.xml
rename to csit/variables/xmls/f216.xml

diff --git a/test/csit/variables/xmls/f217.xml b/csit/variables/xmls/f217.xml
similarity index 100%
rename from test/csit/variables/xmls/f217.xml
rename to csit/variables/xmls/f217.xml

diff --git a/test/csit/variables/xmls/f218.xml b/csit/variables/xmls/f218.xml
similarity index 100%
rename from test/csit/variables/xmls/f218.xml
rename to csit/variables/xmls/f218.xml

diff --git a/test/csit/variables/xmls/f219.xml b/csit/variables/xmls/f219.xml
similarity index 100%
rename from test/csit/variables/xmls/f219.xml
rename to csit/variables/xmls/f219.xml

diff --git a/test/csit/variables/xmls/f22.xml b/csit/variables/xmls/f22.xml
similarity index 100%
rename from test/csit/variables/xmls/f22.xml
rename to csit/variables/xmls/f22.xml

diff --git a/test/csit/variables/xmls/f220.xml b/csit/variables/xmls/f220.xml
similarity index 100%
rename from test/csit/variables/xmls/f220.xml
rename to csit/variables/xmls/f220.xml

diff --git a/test/csit/variables/xmls/f221.xml b/csit/variables/xmls/f221.xml
similarity index 100%
rename from test/csit/variables/xmls/f221.xml
rename to csit/variables/xmls/f221.xml

diff --git a/test/csit/variables/xmls/f23.xml b/csit/variables/xmls/f23.xml
similarity index 100%
rename from test/csit/variables/xmls/f23.xml
rename to csit/variables/xmls/f23.xml

diff --git a/test/csit/variables/xmls/f24.xml b/csit/variables/xmls/f24.xml
similarity index 100%
rename from test/csit/variables/xmls/f24.xml
rename to csit/variables/xmls/f24.xml

diff --git a/test/csit/variables/xmls/f25.xml b/csit/variables/xmls/f25.xml
similarity index 100%
rename from test/csit/variables/xmls/f25.xml
rename to csit/variables/xmls/f25.xml

diff --git a/test/csit/variables/xmls/f26.xml b/csit/variables/xmls/f26.xml
similarity index 100%
rename from test/csit/variables/xmls/f26.xml
rename to csit/variables/xmls/f26.xml

diff --git a/test/csit/variables/xmls/f27.xml b/csit/variables/xmls/f27.xml
similarity index 100%
rename from test/csit/variables/xmls/f27.xml
rename to csit/variables/xmls/f27.xml

diff --git a/test/csit/variables/xmls/f28.xml b/csit/variables/xmls/f28.xml
similarity index 100%
rename from test/csit/variables/xmls/f28.xml
rename to csit/variables/xmls/f28.xml

diff --git a/test/csit/variables/xmls/f29.xml b/csit/variables/xmls/f29.xml
similarity index 100%
rename from test/csit/variables/xmls/f29.xml
rename to csit/variables/xmls/f29.xml

diff --git a/test/csit/variables/xmls/f3.xml b/csit/variables/xmls/f3.xml
similarity index 100%
rename from test/csit/variables/xmls/f3.xml
rename to csit/variables/xmls/f3.xml

diff --git a/test/csit/variables/xmls/f30.xml b/csit/variables/xmls/f30.xml
similarity index 100%
rename from test/csit/variables/xmls/f30.xml
rename to csit/variables/xmls/f30.xml

diff --git a/test/csit/variables/xmls/f31.xml b/csit/variables/xmls/f31.xml
similarity index 100%
rename from test/csit/variables/xmls/f31.xml
rename to csit/variables/xmls/f31.xml

diff --git a/test/csit/variables/xmls/f32.xml b/csit/variables/xmls/f32.xml
similarity index 100%
rename from test/csit/variables/xmls/f32.xml
rename to csit/variables/xmls/f32.xml

diff --git a/test/csit/variables/xmls/f33.xml b/csit/variables/xmls/f33.xml
similarity index 100%
rename from test/csit/variables/xmls/f33.xml
rename to csit/variables/xmls/f33.xml

diff --git a/test/csit/variables/xmls/f34.xml b/csit/variables/xmls/f34.xml
similarity index 100%
rename from test/csit/variables/xmls/f34.xml
rename to csit/variables/xmls/f34.xml

diff --git a/test/csit/variables/xmls/f35.xml b/csit/variables/xmls/f35.xml
similarity index 100%
rename from test/csit/variables/xmls/f35.xml
rename to csit/variables/xmls/f35.xml

diff --git a/test/csit/variables/xmls/f36.xml b/csit/variables/xmls/f36.xml
similarity index 100%
rename from test/csit/variables/xmls/f36.xml
rename to csit/variables/xmls/f36.xml

diff --git a/test/csit/variables/xmls/f37.xml b/csit/variables/xmls/f37.xml
similarity index 100%
rename from test/csit/variables/xmls/f37.xml
rename to csit/variables/xmls/f37.xml

diff --git a/test/csit/variables/xmls/f38.xml b/csit/variables/xmls/f38.xml
similarity index 100%
rename from test/csit/variables/xmls/f38.xml
rename to csit/variables/xmls/f38.xml

diff --git a/test/csit/variables/xmls/f39.xml b/csit/variables/xmls/f39.xml
similarity index 100%
rename from test/csit/variables/xmls/f39.xml
rename to csit/variables/xmls/f39.xml

diff --git a/test/csit/variables/xmls/f4.xml b/csit/variables/xmls/f4.xml
similarity index 100%
rename from test/csit/variables/xmls/f4.xml
rename to csit/variables/xmls/f4.xml

diff --git a/test/csit/variables/xmls/f40.xml b/csit/variables/xmls/f40.xml
similarity index 100%
rename from test/csit/variables/xmls/f40.xml
rename to csit/variables/xmls/f40.xml

diff --git a/test/csit/variables/xmls/f41.xml b/csit/variables/xmls/f41.xml
similarity index 100%
rename from test/csit/variables/xmls/f41.xml
rename to csit/variables/xmls/f41.xml

diff --git a/test/csit/variables/xmls/f42.xml b/csit/variables/xmls/f42.xml
similarity index 100%
rename from test/csit/variables/xmls/f42.xml
rename to csit/variables/xmls/f42.xml

diff --git a/test/csit/variables/xmls/f43.xml b/csit/variables/xmls/f43.xml
similarity index 100%
rename from test/csit/variables/xmls/f43.xml
rename to csit/variables/xmls/f43.xml

diff --git a/test/csit/variables/xmls/f44.xml b/csit/variables/xmls/f44.xml
similarity index 100%
rename from test/csit/variables/xmls/f44.xml
rename to csit/variables/xmls/f44.xml

diff --git a/test/csit/variables/xmls/f45.xml b/csit/variables/xmls/f45.xml
similarity index 100%
rename from test/csit/variables/xmls/f45.xml
rename to csit/variables/xmls/f45.xml

diff --git a/test/csit/variables/xmls/f46.xml b/csit/variables/xmls/f46.xml
similarity index 100%
rename from test/csit/variables/xmls/f46.xml
rename to csit/variables/xmls/f46.xml

diff --git a/test/csit/variables/xmls/f47.xml b/csit/variables/xmls/f47.xml
similarity index 100%
rename from test/csit/variables/xmls/f47.xml
rename to csit/variables/xmls/f47.xml

diff --git a/test/csit/variables/xmls/f48.xml b/csit/variables/xmls/f48.xml
similarity index 100%
rename from test/csit/variables/xmls/f48.xml
rename to csit/variables/xmls/f48.xml

diff --git a/test/csit/variables/xmls/f49.xml b/csit/variables/xmls/f49.xml
similarity index 100%
rename from test/csit/variables/xmls/f49.xml
rename to csit/variables/xmls/f49.xml

diff --git a/test/csit/variables/xmls/f5.xml b/csit/variables/xmls/f5.xml
similarity index 100%
rename from test/csit/variables/xmls/f5.xml
rename to csit/variables/xmls/f5.xml

diff --git a/test/csit/variables/xmls/f50.xml b/csit/variables/xmls/f50.xml
similarity index 100%
rename from test/csit/variables/xmls/f50.xml
rename to csit/variables/xmls/f50.xml

diff --git a/test/csit/variables/xmls/f51.xml b/csit/variables/xmls/f51.xml
similarity index 100%
rename from test/csit/variables/xmls/f51.xml
rename to csit/variables/xmls/f51.xml

diff --git a/test/csit/variables/xmls/f6.xml b/csit/variables/xmls/f6.xml
similarity index 100%
rename from test/csit/variables/xmls/f6.xml
rename to csit/variables/xmls/f6.xml

diff --git a/test/csit/variables/xmls/f7.xml b/csit/variables/xmls/f7.xml
similarity index 100%
rename from test/csit/variables/xmls/f7.xml
rename to csit/variables/xmls/f7.xml

diff --git a/test/csit/variables/xmls/f8.xml b/csit/variables/xmls/f8.xml
similarity index 100%
rename from test/csit/variables/xmls/f8.xml
rename to csit/variables/xmls/f8.xml

diff --git a/test/csit/variables/xmls/f9.xml b/csit/variables/xmls/f9.xml
similarity index 100%
rename from test/csit/variables/xmls/f9.xml
rename to csit/variables/xmls/f9.xml

diff --git a/test/csit/variables/xmls/g1.xml b/csit/variables/xmls/g1.xml
similarity index 100%
rename from test/csit/variables/xmls/g1.xml
rename to csit/variables/xmls/g1.xml

diff --git a/test/csit/variables/xmls/g2.xml b/csit/variables/xmls/g2.xml
similarity index 100%
rename from test/csit/variables/xmls/g2.xml
rename to csit/variables/xmls/g2.xml

diff --git a/test/csit/variables/xmls/g3.xml b/csit/variables/xmls/g3.xml
similarity index 100%
rename from test/csit/variables/xmls/g3.xml
rename to csit/variables/xmls/g3.xml

diff --git a/test/csit/variables/xmls/g4.xml b/csit/variables/xmls/g4.xml
similarity index 100%
rename from test/csit/variables/xmls/g4.xml
rename to csit/variables/xmls/g4.xml

diff --git a/test/csit/variables/xmls/genericActionFlow.xml b/csit/variables/xmls/genericActionFlow.xml
similarity index 100%
rename from test/csit/variables/xmls/genericActionFlow.xml
rename to csit/variables/xmls/genericActionFlow.xml

diff --git a/test/csit/variables/xmls/m1.xml b/csit/variables/xmls/m1.xml
similarity index 100%
rename from test/csit/variables/xmls/m1.xml
rename to csit/variables/xmls/m1.xml

diff --git a/test/csit/variables/xmls/m2.xml b/csit/variables/xmls/m2.xml
similarity index 100%
rename from test/csit/variables/xmls/m2.xml
rename to csit/variables/xmls/m2.xml

diff --git a/test/csit/variables/xmls/m3.xml b/csit/variables/xmls/m3.xml
similarity index 100%
rename from test/csit/variables/xmls/m3.xml
rename to csit/variables/xmls/m3.xml

diff --git a/test/csit/variables/xmls/m4.xml b/csit/variables/xmls/m4.xml
similarity index 100%
rename from test/csit/variables/xmls/m4.xml
rename to csit/variables/xmls/m4.xml

diff --git a/test/csit/variables/xmls/netconf.xml b/csit/variables/xmls/netconf.xml
similarity index 100%
rename from test/csit/variables/xmls/netconf.xml
rename to csit/variables/xmls/netconf.xml

diff --git a/test/csit/libraries/SwitchClasses/H3C.pyc b/test/csit/libraries/SwitchClasses/H3C.pyc
deleted file mode 100644 (file)
index 700834c..0000000
Binary files a/test/csit/libraries/SwitchClasses/H3C.pyc and /dev/null differ

diff --git a/test/csit/libraries/SwitchClasses/H3C_5920.pyc b/test/csit/libraries/SwitchClasses/H3C_5920.pyc
deleted file mode 100644 (file)
index fa00539..0000000
Binary files a/test/csit/libraries/SwitchClasses/H3C_5920.pyc and /dev/null differ

diff --git a/test/tools/clustering/cluster-deployer/temp/README b/test/tools/clustering/cluster-deployer/temp/README
deleted file mode 100644 (file)
index dc2a9e1..0000000
--- a/test/tools/clustering/cluster-deployer/temp/README
+++ /dev/null
@@ -1 +0,0 @@
-README - to ensure this directory exists
\ No newline at end of file

diff --git a/test/tools/CSIT_Test/base/__init__.py b/tools/CSIT_Test/base/__init__.py
similarity index 100%
rename from test/tools/CSIT_Test/base/__init__.py
rename to tools/CSIT_Test/base/__init__.py

diff --git a/test/tools/CSIT_Test/base/modules/arp_handler.py b/tools/CSIT_Test/base/modules/arp_handler.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/arp_handler.py
rename to tools/CSIT_Test/base/modules/arp_handler.py

diff --git a/test/tools/CSIT_Test/base/modules/container_manager.py b/tools/CSIT_Test/base/modules/container_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/container_manager.py
rename to tools/CSIT_Test/base/modules/container_manager.py

diff --git a/test/tools/CSIT_Test/base/modules/forwarding_manager.py b/tools/CSIT_Test/base/modules/forwarding_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/forwarding_manager.py
rename to tools/CSIT_Test/base/modules/forwarding_manager.py

diff --git a/test/tools/CSIT_Test/base/modules/forwarding_rule_manager.py b/tools/CSIT_Test/base/modules/forwarding_rule_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/forwarding_rule_manager.py
rename to tools/CSIT_Test/base/modules/forwarding_rule_manager.py

diff --git a/test/tools/CSIT_Test/base/modules/host_tracker.py b/tools/CSIT_Test/base/modules/host_tracker.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/host_tracker.py
rename to tools/CSIT_Test/base/modules/host_tracker.py

diff --git a/test/tools/CSIT_Test/base/modules/statistics_manager.py b/tools/CSIT_Test/base/modules/statistics_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/statistics_manager.py
rename to tools/CSIT_Test/base/modules/statistics_manager.py

diff --git a/test/tools/CSIT_Test/base/modules/switch_manager.py b/tools/CSIT_Test/base/modules/switch_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/switch_manager.py
rename to tools/CSIT_Test/base/modules/switch_manager.py

diff --git a/test/tools/CSIT_Test/base/modules/topology_manager.py b/tools/CSIT_Test/base/modules/topology_manager.py
similarity index 100%
rename from test/tools/CSIT_Test/base/modules/topology_manager.py
rename to tools/CSIT_Test/base/modules/topology_manager.py

diff --git a/test/tools/CSIT_Test/base/restlib.py b/tools/CSIT_Test/base/restlib.py
similarity index 100%
rename from test/tools/CSIT_Test/base/restlib.py
rename to tools/CSIT_Test/base/restlib.py

diff --git a/test/tools/CSIT_Test/base/run.py b/tools/CSIT_Test/base/run.py
similarity index 100%
rename from test/tools/CSIT_Test/base/run.py
rename to tools/CSIT_Test/base/run.py

diff --git a/test/tools/CSIT_Test/base/testmodule.py b/tools/CSIT_Test/base/testmodule.py
similarity index 100%
rename from test/tools/CSIT_Test/base/testmodule.py
rename to tools/CSIT_Test/base/testmodule.py

diff --git a/test/tools/OF_Test/action-keywords.csv b/tools/OF_Test/action-keywords.csv
similarity index 100%
rename from test/tools/OF_Test/action-keywords.csv
rename to tools/OF_Test/action-keywords.csv

diff --git a/test/tools/OF_Test/keywords.csv b/tools/OF_Test/keywords.csv
similarity index 100%
rename from test/tools/OF_Test/keywords.csv
rename to tools/OF_Test/keywords.csv

diff --git a/test/tools/OF_Test/keywords.csv.backup b/tools/OF_Test/keywords.csv.backup
similarity index 100%
rename from test/tools/OF_Test/keywords.csv.backup
rename to tools/OF_Test/keywords.csv.backup

diff --git a/test/tools/OF_Test/match-keywords.csv b/tools/OF_Test/match-keywords.csv
similarity index 100%
rename from test/tools/OF_Test/match-keywords.csv
rename to tools/OF_Test/match-keywords.csv

diff --git a/test/tools/OF_Test/odl_tests.py b/tools/OF_Test/odl_tests.py
similarity index 100%
rename from test/tools/OF_Test/odl_tests.py
rename to tools/OF_Test/odl_tests.py

diff --git a/test/tools/OF_Test/odl_tests.py.backup b/tools/OF_Test/odl_tests.py.backup
similarity index 100%
rename from test/tools/OF_Test/odl_tests.py.backup
rename to tools/OF_Test/odl_tests.py.backup

diff --git a/test/tools/OF_Test/ofctl/t1 b/tools/OF_Test/ofctl/t1
similarity index 100%
rename from test/tools/OF_Test/ofctl/t1
rename to tools/OF_Test/ofctl/t1

diff --git a/test/tools/OF_Test/ofctl/t11 b/tools/OF_Test/ofctl/t11
similarity index 100%
rename from test/tools/OF_Test/ofctl/t11
rename to tools/OF_Test/ofctl/t11

diff --git a/test/tools/OF_Test/ofctl/t19 b/tools/OF_Test/ofctl/t19
similarity index 100%
rename from test/tools/OF_Test/ofctl/t19
rename to tools/OF_Test/ofctl/t19

diff --git a/test/tools/OF_Test/ofctl/t2 b/tools/OF_Test/ofctl/t2
similarity index 100%
rename from test/tools/OF_Test/ofctl/t2
rename to tools/OF_Test/ofctl/t2

diff --git a/test/tools/OF_Test/ofctl/t20 b/tools/OF_Test/ofctl/t20
similarity index 100%
rename from test/tools/OF_Test/ofctl/t20
rename to tools/OF_Test/ofctl/t20

diff --git a/test/tools/OF_Test/ofctl/t21 b/tools/OF_Test/ofctl/t21
similarity index 100%
rename from test/tools/OF_Test/ofctl/t21
rename to tools/OF_Test/ofctl/t21

diff --git a/test/tools/OF_Test/ofctl/t22 b/tools/OF_Test/ofctl/t22
similarity index 100%
rename from test/tools/OF_Test/ofctl/t22
rename to tools/OF_Test/ofctl/t22

diff --git a/test/tools/OF_Test/ofctl/t25 b/tools/OF_Test/ofctl/t25
similarity index 100%
rename from test/tools/OF_Test/ofctl/t25
rename to tools/OF_Test/ofctl/t25

diff --git a/test/tools/OF_Test/ofctl/t27 b/tools/OF_Test/ofctl/t27
similarity index 100%
rename from test/tools/OF_Test/ofctl/t27
rename to tools/OF_Test/ofctl/t27

diff --git a/test/tools/OF_Test/ofctl/t29 b/tools/OF_Test/ofctl/t29
similarity index 100%
rename from test/tools/OF_Test/ofctl/t29
rename to tools/OF_Test/ofctl/t29

diff --git a/test/tools/OF_Test/ofctl/t30 b/tools/OF_Test/ofctl/t30
similarity index 100%
rename from test/tools/OF_Test/ofctl/t30
rename to tools/OF_Test/ofctl/t30

diff --git a/test/tools/OF_Test/ofctl/t31 b/tools/OF_Test/ofctl/t31
similarity index 100%
rename from test/tools/OF_Test/ofctl/t31
rename to tools/OF_Test/ofctl/t31

diff --git a/test/tools/OF_Test/ofctl/t33 b/tools/OF_Test/ofctl/t33
similarity index 100%
rename from test/tools/OF_Test/ofctl/t33
rename to tools/OF_Test/ofctl/t33

diff --git a/test/tools/OF_Test/ofctl/t36 b/tools/OF_Test/ofctl/t36
similarity index 100%
rename from test/tools/OF_Test/ofctl/t36
rename to tools/OF_Test/ofctl/t36

diff --git a/test/tools/OF_Test/ofctl/t38 b/tools/OF_Test/ofctl/t38
similarity index 100%
rename from test/tools/OF_Test/ofctl/t38
rename to tools/OF_Test/ofctl/t38

diff --git a/test/tools/OF_Test/ofctl/t4 b/tools/OF_Test/ofctl/t4
similarity index 100%
rename from test/tools/OF_Test/ofctl/t4
rename to tools/OF_Test/ofctl/t4

diff --git a/test/tools/OF_Test/ofctl/t41 b/tools/OF_Test/ofctl/t41
similarity index 100%
rename from test/tools/OF_Test/ofctl/t41
rename to tools/OF_Test/ofctl/t41

diff --git a/test/tools/OF_Test/ofctl/t43 b/tools/OF_Test/ofctl/t43
similarity index 100%
rename from test/tools/OF_Test/ofctl/t43
rename to tools/OF_Test/ofctl/t43

diff --git a/test/tools/OF_Test/ofctl/t45 b/tools/OF_Test/ofctl/t45
similarity index 100%
rename from test/tools/OF_Test/ofctl/t45
rename to tools/OF_Test/ofctl/t45

diff --git a/test/tools/OF_Test/ofctl/t48 b/tools/OF_Test/ofctl/t48
similarity index 100%
rename from test/tools/OF_Test/ofctl/t48
rename to tools/OF_Test/ofctl/t48

diff --git a/test/tools/OF_Test/ofctl/t5 b/tools/OF_Test/ofctl/t5
similarity index 100%
rename from test/tools/OF_Test/ofctl/t5
rename to tools/OF_Test/ofctl/t5

diff --git a/test/tools/OF_Test/ofctl/t6 b/tools/OF_Test/ofctl/t6
similarity index 100%
rename from test/tools/OF_Test/ofctl/t6
rename to tools/OF_Test/ofctl/t6

diff --git a/test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/010__Connect_256_Switches.txt b/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/010__Connect_256_Switches.txt
similarity index 100%
rename from test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/010__Connect_256_Switches.txt
rename to tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/010__Connect_256_Switches.txt

diff --git a/test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/030_Config_100k_flows.txt b/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/030_Config_100k_flows.txt
similarity index 100%
rename from test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/030_Config_100k_flows.txt
rename to tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/030_Config_100k_flows.txt

diff --git a/test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/libconfig.py b/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/libconfig.py
similarity index 100%
rename from test/tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/libconfig.py
rename to tools/OF_Test/robot_suites/998__Independent_OF_Tests_ovs/libconfig.py

diff --git a/test/tools/OF_Test/test.py b/tools/OF_Test/test.py
similarity index 100%
rename from test/tools/OF_Test/test.py
rename to tools/OF_Test/test.py

diff --git a/test/tools/OF_Test/test1.py b/tools/OF_Test/test1.py
similarity index 100%
rename from test/tools/OF_Test/test1.py
rename to tools/OF_Test/test1.py

diff --git a/test/tools/OF_Test/xmls/f1.xml b/tools/OF_Test/xmls/f1.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f1.xml
rename to tools/OF_Test/xmls/f1.xml

diff --git a/test/tools/OF_Test/xmls/f10.xml b/tools/OF_Test/xmls/f10.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f10.xml
rename to tools/OF_Test/xmls/f10.xml

diff --git a/test/tools/OF_Test/xmls/f11.xml b/tools/OF_Test/xmls/f11.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f11.xml
rename to tools/OF_Test/xmls/f11.xml

diff --git a/test/tools/OF_Test/xmls/f12.xml b/tools/OF_Test/xmls/f12.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f12.xml
rename to tools/OF_Test/xmls/f12.xml

diff --git a/test/tools/OF_Test/xmls/f13.xml b/tools/OF_Test/xmls/f13.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f13.xml
rename to tools/OF_Test/xmls/f13.xml

diff --git a/test/tools/OF_Test/xmls/f14.xml b/tools/OF_Test/xmls/f14.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f14.xml
rename to tools/OF_Test/xmls/f14.xml

diff --git a/test/tools/OF_Test/xmls/f15.xml b/tools/OF_Test/xmls/f15.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f15.xml
rename to tools/OF_Test/xmls/f15.xml

diff --git a/test/tools/OF_Test/xmls/f16.xml b/tools/OF_Test/xmls/f16.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f16.xml
rename to tools/OF_Test/xmls/f16.xml

diff --git a/test/tools/OF_Test/xmls/f17.xml b/tools/OF_Test/xmls/f17.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f17.xml
rename to tools/OF_Test/xmls/f17.xml

diff --git a/test/tools/OF_Test/xmls/f18.xml b/tools/OF_Test/xmls/f18.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f18.xml
rename to tools/OF_Test/xmls/f18.xml

diff --git a/test/tools/OF_Test/xmls/f19.xml b/tools/OF_Test/xmls/f19.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f19.xml
rename to tools/OF_Test/xmls/f19.xml

diff --git a/test/tools/OF_Test/xmls/f2.xml b/tools/OF_Test/xmls/f2.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f2.xml
rename to tools/OF_Test/xmls/f2.xml

diff --git a/test/tools/OF_Test/xmls/f20.xml b/tools/OF_Test/xmls/f20.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f20.xml
rename to tools/OF_Test/xmls/f20.xml

diff --git a/test/tools/OF_Test/xmls/f21.xml b/tools/OF_Test/xmls/f21.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f21.xml
rename to tools/OF_Test/xmls/f21.xml

diff --git a/test/tools/OF_Test/xmls/f22.xml b/tools/OF_Test/xmls/f22.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f22.xml
rename to tools/OF_Test/xmls/f22.xml

diff --git a/test/tools/OF_Test/xmls/f23.xml b/tools/OF_Test/xmls/f23.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f23.xml
rename to tools/OF_Test/xmls/f23.xml

diff --git a/test/tools/OF_Test/xmls/f24.xml b/tools/OF_Test/xmls/f24.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f24.xml
rename to tools/OF_Test/xmls/f24.xml

diff --git a/test/tools/OF_Test/xmls/f25.xml b/tools/OF_Test/xmls/f25.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f25.xml
rename to tools/OF_Test/xmls/f25.xml

diff --git a/test/tools/OF_Test/xmls/f26.xml b/tools/OF_Test/xmls/f26.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f26.xml
rename to tools/OF_Test/xmls/f26.xml

diff --git a/test/tools/OF_Test/xmls/f27.xml b/tools/OF_Test/xmls/f27.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f27.xml
rename to tools/OF_Test/xmls/f27.xml

diff --git a/test/tools/OF_Test/xmls/f28.xml b/tools/OF_Test/xmls/f28.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f28.xml
rename to tools/OF_Test/xmls/f28.xml

diff --git a/test/tools/OF_Test/xmls/f29.xml b/tools/OF_Test/xmls/f29.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f29.xml
rename to tools/OF_Test/xmls/f29.xml

diff --git a/test/tools/OF_Test/xmls/f3.xml b/tools/OF_Test/xmls/f3.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f3.xml
rename to tools/OF_Test/xmls/f3.xml

diff --git a/test/tools/OF_Test/xmls/f30.xml b/tools/OF_Test/xmls/f30.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f30.xml
rename to tools/OF_Test/xmls/f30.xml

diff --git a/test/tools/OF_Test/xmls/f31.xml b/tools/OF_Test/xmls/f31.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f31.xml
rename to tools/OF_Test/xmls/f31.xml

diff --git a/test/tools/OF_Test/xmls/f32.xml b/tools/OF_Test/xmls/f32.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f32.xml
rename to tools/OF_Test/xmls/f32.xml

diff --git a/test/tools/OF_Test/xmls/f33.xml b/tools/OF_Test/xmls/f33.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f33.xml
rename to tools/OF_Test/xmls/f33.xml

diff --git a/test/tools/OF_Test/xmls/f34.xml b/tools/OF_Test/xmls/f34.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f34.xml
rename to tools/OF_Test/xmls/f34.xml

diff --git a/test/tools/OF_Test/xmls/f35.xml b/tools/OF_Test/xmls/f35.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f35.xml
rename to tools/OF_Test/xmls/f35.xml

diff --git a/test/tools/OF_Test/xmls/f36.xml b/tools/OF_Test/xmls/f36.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f36.xml
rename to tools/OF_Test/xmls/f36.xml

diff --git a/test/tools/OF_Test/xmls/f37.xml b/tools/OF_Test/xmls/f37.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f37.xml
rename to tools/OF_Test/xmls/f37.xml

diff --git a/test/tools/OF_Test/xmls/f38.xml b/tools/OF_Test/xmls/f38.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f38.xml
rename to tools/OF_Test/xmls/f38.xml

diff --git a/test/tools/OF_Test/xmls/f39.xml b/tools/OF_Test/xmls/f39.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f39.xml
rename to tools/OF_Test/xmls/f39.xml

diff --git a/test/tools/OF_Test/xmls/f4.xml b/tools/OF_Test/xmls/f4.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f4.xml
rename to tools/OF_Test/xmls/f4.xml

diff --git a/test/tools/OF_Test/xmls/f40.xml b/tools/OF_Test/xmls/f40.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f40.xml
rename to tools/OF_Test/xmls/f40.xml

diff --git a/test/tools/OF_Test/xmls/f41.xml b/tools/OF_Test/xmls/f41.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f41.xml
rename to tools/OF_Test/xmls/f41.xml

diff --git a/test/tools/OF_Test/xmls/f42.xml b/tools/OF_Test/xmls/f42.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f42.xml
rename to tools/OF_Test/xmls/f42.xml

diff --git a/test/tools/OF_Test/xmls/f43.xml b/tools/OF_Test/xmls/f43.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f43.xml
rename to tools/OF_Test/xmls/f43.xml

diff --git a/test/tools/OF_Test/xmls/f44.xml b/tools/OF_Test/xmls/f44.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f44.xml
rename to tools/OF_Test/xmls/f44.xml

diff --git a/test/tools/OF_Test/xmls/f45.xml b/tools/OF_Test/xmls/f45.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f45.xml
rename to tools/OF_Test/xmls/f45.xml

diff --git a/test/tools/OF_Test/xmls/f46.xml b/tools/OF_Test/xmls/f46.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f46.xml
rename to tools/OF_Test/xmls/f46.xml

diff --git a/test/tools/OF_Test/xmls/f47.xml b/tools/OF_Test/xmls/f47.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f47.xml
rename to tools/OF_Test/xmls/f47.xml

diff --git a/test/tools/OF_Test/xmls/f48.xml b/tools/OF_Test/xmls/f48.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f48.xml
rename to tools/OF_Test/xmls/f48.xml

diff --git a/test/tools/OF_Test/xmls/f49.xml b/tools/OF_Test/xmls/f49.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f49.xml
rename to tools/OF_Test/xmls/f49.xml

diff --git a/test/tools/OF_Test/xmls/f5.xml b/tools/OF_Test/xmls/f5.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f5.xml
rename to tools/OF_Test/xmls/f5.xml

diff --git a/test/tools/OF_Test/xmls/f6.xml b/tools/OF_Test/xmls/f6.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f6.xml
rename to tools/OF_Test/xmls/f6.xml

diff --git a/test/tools/OF_Test/xmls/f7.xml b/tools/OF_Test/xmls/f7.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f7.xml
rename to tools/OF_Test/xmls/f7.xml

diff --git a/test/tools/OF_Test/xmls/f8.xml b/tools/OF_Test/xmls/f8.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f8.xml
rename to tools/OF_Test/xmls/f8.xml

diff --git a/test/tools/OF_Test/xmls/f9.xml b/tools/OF_Test/xmls/f9.xml
similarity index 100%
rename from test/tools/OF_Test/xmls/f9.xml
rename to tools/OF_Test/xmls/f9.xml

diff --git a/test/tools/Robot_Tool/README.md b/tools/Robot_Tool/README.md
similarity index 100%
rename from test/tools/Robot_Tool/README.md
rename to tools/Robot_Tool/README.md

diff --git a/test/tools/Robot_Tool/create_docs.py b/tools/Robot_Tool/create_docs.py
similarity index 100%
rename from test/tools/Robot_Tool/create_docs.py
rename to tools/Robot_Tool/create_docs.py

diff --git a/test/tools/Robot_Tool/libraries/ArpHandler.py b/tools/Robot_Tool/libraries/ArpHandler.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/ArpHandler.py
rename to tools/Robot_Tool/libraries/ArpHandler.py

diff --git a/test/tools/Robot_Tool/libraries/Common.py b/tools/Robot_Tool/libraries/Common.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/Common.py
rename to tools/Robot_Tool/libraries/Common.py

diff --git a/test/tools/Robot_Tool/libraries/ContainerManager.py b/tools/Robot_Tool/libraries/ContainerManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/ContainerManager.py
rename to tools/Robot_Tool/libraries/ContainerManager.py

diff --git a/test/tools/Robot_Tool/libraries/ForwardingManager.py b/tools/Robot_Tool/libraries/ForwardingManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/ForwardingManager.py
rename to tools/Robot_Tool/libraries/ForwardingManager.py

diff --git a/test/tools/Robot_Tool/libraries/ForwardingRuleManager.py b/tools/Robot_Tool/libraries/ForwardingRuleManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/ForwardingRuleManager.py
rename to tools/Robot_Tool/libraries/ForwardingRuleManager.py

diff --git a/test/tools/Robot_Tool/libraries/HostTracker.py b/tools/Robot_Tool/libraries/HostTracker.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/HostTracker.py
rename to tools/Robot_Tool/libraries/HostTracker.py

diff --git a/test/tools/Robot_Tool/libraries/MininetHandler.py b/tools/Robot_Tool/libraries/MininetHandler.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/MininetHandler.py
rename to tools/Robot_Tool/libraries/MininetHandler.py

diff --git a/test/tools/Robot_Tool/libraries/README.md b/tools/Robot_Tool/libraries/README.md
similarity index 100%
rename from test/tools/Robot_Tool/libraries/README.md
rename to tools/Robot_Tool/libraries/README.md

diff --git a/test/tools/Robot_Tool/libraries/RequestsLibrary.py b/tools/Robot_Tool/libraries/RequestsLibrary.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/RequestsLibrary.py
rename to tools/Robot_Tool/libraries/RequestsLibrary.py

diff --git a/test/tools/Robot_Tool/libraries/StatisticsManager.py b/tools/Robot_Tool/libraries/StatisticsManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/StatisticsManager.py
rename to tools/Robot_Tool/libraries/StatisticsManager.py

diff --git a/test/tools/Robot_Tool/libraries/SwitchManager.py b/tools/Robot_Tool/libraries/SwitchManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/SwitchManager.py
rename to tools/Robot_Tool/libraries/SwitchManager.py

diff --git a/test/tools/Robot_Tool/libraries/Topology.py b/tools/Robot_Tool/libraries/Topology.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/Topology.py
rename to tools/Robot_Tool/libraries/Topology.py

diff --git a/test/tools/Robot_Tool/libraries/TopologyManager.py b/tools/Robot_Tool/libraries/TopologyManager.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/TopologyManager.py
rename to tools/Robot_Tool/libraries/TopologyManager.py

diff --git a/test/tools/Robot_Tool/libraries/restlib.py b/tools/Robot_Tool/libraries/restlib.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/restlib.py
rename to tools/Robot_Tool/libraries/restlib.py

diff --git a/test/tools/Robot_Tool/libraries/testmodule.py b/tools/Robot_Tool/libraries/testmodule.py
similarity index 100%
rename from test/tools/Robot_Tool/libraries/testmodule.py
rename to tools/Robot_Tool/libraries/testmodule.py

diff --git a/test/tools/Robot_Tool/resources/README.md b/tools/Robot_Tool/resources/README.md
similarity index 100%
rename from test/tools/Robot_Tool/resources/README.md
rename to tools/Robot_Tool/resources/README.md

diff --git a/test/tools/Robot_Tool/suites/base/__init__.txt b/tools/Robot_Tool/suites/base/__init__.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/__init__.txt
rename to tools/Robot_Tool/suites/base/__init__.txt

diff --git a/test/tools/Robot_Tool/suites/base/arp_handler.txt b/tools/Robot_Tool/suites/base/arp_handler.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/arp_handler.txt
rename to tools/Robot_Tool/suites/base/arp_handler.txt

diff --git a/test/tools/Robot_Tool/suites/base/container_manager.txt b/tools/Robot_Tool/suites/base/container_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/container_manager.txt
rename to tools/Robot_Tool/suites/base/container_manager.txt

diff --git a/test/tools/Robot_Tool/suites/base/forwarding_manager.txt b/tools/Robot_Tool/suites/base/forwarding_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/forwarding_manager.txt
rename to tools/Robot_Tool/suites/base/forwarding_manager.txt

diff --git a/test/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt b/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/forwarding_rule_manager.txt
rename to tools/Robot_Tool/suites/base/forwarding_rule_manager.txt

diff --git a/test/tools/Robot_Tool/suites/base/host_tracker.txt b/tools/Robot_Tool/suites/base/host_tracker.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/host_tracker.txt
rename to tools/Robot_Tool/suites/base/host_tracker.txt

diff --git a/test/tools/Robot_Tool/suites/base/statistics_manager.txt b/tools/Robot_Tool/suites/base/statistics_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/statistics_manager.txt
rename to tools/Robot_Tool/suites/base/statistics_manager.txt

diff --git a/test/tools/Robot_Tool/suites/base/switch_manager.txt b/tools/Robot_Tool/suites/base/switch_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/switch_manager.txt
rename to tools/Robot_Tool/suites/base/switch_manager.txt

diff --git a/test/tools/Robot_Tool/suites/base/topology_manager.txt b/tools/Robot_Tool/suites/base/topology_manager.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/base/topology_manager.txt
rename to tools/Robot_Tool/suites/base/topology_manager.txt

diff --git a/test/tools/Robot_Tool/suites/cluster/010__bridge_topology.txt b/tools/Robot_Tool/suites/cluster/010__bridge_topology.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/cluster/010__bridge_topology.txt
rename to tools/Robot_Tool/suites/cluster/010__bridge_topology.txt

diff --git a/test/tools/Robot_Tool/suites/cluster/015__FRM.txt b/tools/Robot_Tool/suites/cluster/015__FRM.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/cluster/015__FRM.txt
rename to tools/Robot_Tool/suites/cluster/015__FRM.txt

diff --git a/test/tools/Robot_Tool/suites/cluster/020__c1_fails.txt b/tools/Robot_Tool/suites/cluster/020__c1_fails.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/cluster/020__c1_fails.txt
rename to tools/Robot_Tool/suites/cluster/020__c1_fails.txt

diff --git a/test/tools/Robot_Tool/suites/cluster/025__c2_fails.txt b/tools/Robot_Tool/suites/cluster/025__c2_fails.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/cluster/025__c2_fails.txt
rename to tools/Robot_Tool/suites/cluster/025__c2_fails.txt

diff --git a/test/tools/Robot_Tool/suites/cluster/__init__.txt b/tools/Robot_Tool/suites/cluster/__init__.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/cluster/__init__.txt
rename to tools/Robot_Tool/suites/cluster/__init__.txt

diff --git a/test/tools/Robot_Tool/suites/ha/005__two_controller_running.txt b/tools/Robot_Tool/suites/ha/005__two_controller_running.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/005__two_controller_running.txt
rename to tools/Robot_Tool/suites/ha/005__two_controller_running.txt

diff --git a/test/tools/Robot_Tool/suites/ha/010__c1_fails.txt b/tools/Robot_Tool/suites/ha/010__c1_fails.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/010__c1_fails.txt
rename to tools/Robot_Tool/suites/ha/010__c1_fails.txt

diff --git a/test/tools/Robot_Tool/suites/ha/015__c2_fails.txt b/tools/Robot_Tool/suites/ha/015__c2_fails.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/015__c2_fails.txt
rename to tools/Robot_Tool/suites/ha/015__c2_fails.txt

diff --git a/test/tools/Robot_Tool/suites/ha/020__c1_recovers.txt b/tools/Robot_Tool/suites/ha/020__c1_recovers.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/020__c1_recovers.txt
rename to tools/Robot_Tool/suites/ha/020__c1_recovers.txt

diff --git a/test/tools/Robot_Tool/suites/ha/025__two_controllers_fail.txt b/tools/Robot_Tool/suites/ha/025__two_controllers_fail.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/025__two_controllers_fail.txt
rename to tools/Robot_Tool/suites/ha/025__two_controllers_fail.txt

diff --git a/test/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt b/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt
rename to tools/Robot_Tool/suites/ha/030__two_controller_see_flow.txt

diff --git a/test/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt b/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt
rename to tools/Robot_Tool/suites/ha/035__installed_flow_remains.txt

diff --git a/test/tools/Robot_Tool/suites/ha/__init__.txt b/tools/Robot_Tool/suites/ha/__init__.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/__init__.txt
rename to tools/Robot_Tool/suites/ha/__init__.txt

diff --git a/test/tools/Robot_Tool/suites/ha/resource.txt b/tools/Robot_Tool/suites/ha/resource.txt
similarity index 100%
rename from test/tools/Robot_Tool/suites/ha/resource.txt
rename to tools/Robot_Tool/suites/ha/resource.txt

diff --git a/test/tools/Robot_Tool/variables/README.md b/tools/Robot_Tool/variables/README.md
similarity index 100%
rename from test/tools/Robot_Tool/variables/README.md
rename to tools/Robot_Tool/variables/README.md

diff --git a/test/tools/Robot_Tool/variables/Variables.py b/tools/Robot_Tool/variables/Variables.py
similarity index 100%
rename from test/tools/Robot_Tool/variables/Variables.py
rename to tools/Robot_Tool/variables/Variables.py

diff --git a/test/tools/clustering/cluster-debugging/transaction-tracking/extract.sh b/tools/clustering/cluster-debugging/transaction-tracking/extract.sh
similarity index 100%
rename from test/tools/clustering/cluster-debugging/transaction-tracking/extract.sh
rename to tools/clustering/cluster-debugging/transaction-tracking/extract.sh

diff --git a/test/tools/clustering/cluster-debugging/transaction-tracking/filter_transactions.py b/tools/clustering/cluster-debugging/transaction-tracking/filter_transactions.py
similarity index 100%
rename from test/tools/clustering/cluster-debugging/transaction-tracking/filter_transactions.py
rename to tools/clustering/cluster-debugging/transaction-tracking/filter_transactions.py

diff --git a/test/tools/clustering/cluster-debugging/transaction-tracking/process.py b/tools/clustering/cluster-debugging/transaction-tracking/process.py
similarity index 100%
rename from test/tools/clustering/cluster-debugging/transaction-tracking/process.py
rename to tools/clustering/cluster-debugging/transaction-tracking/process.py

diff --git a/test/tools/clustering/cluster-debugging/transaction-tracking/to_csv.py b/tools/clustering/cluster-debugging/transaction-tracking/to_csv.py
similarity index 100%
rename from test/tools/clustering/cluster-debugging/transaction-tracking/to_csv.py
rename to tools/clustering/cluster-debugging/transaction-tracking/to_csv.py

diff --git a/test/tools/clustering/cluster-deployer/.gitignore b/tools/clustering/cluster-deployer/.gitignore
similarity index 100%
rename from test/tools/clustering/cluster-deployer/.gitignore
rename to tools/clustering/cluster-deployer/.gitignore

diff --git a/test/tools/clustering/cluster-deployer/deploy.py b/tools/clustering/cluster-deployer/deploy.py
similarity index 100%
rename from test/tools/clustering/cluster-deployer/deploy.py
rename to tools/clustering/cluster-deployer/deploy.py

diff --git a/test/tools/clustering/cluster-deployer/kill_controller.sh b/tools/clustering/cluster-deployer/kill_controller.sh
similarity index 100%
rename from test/tools/clustering/cluster-deployer/kill_controller.sh
rename to tools/clustering/cluster-deployer/kill_controller.sh

diff --git a/test/tools/clustering/cluster-deployer/remote_host.py b/tools/clustering/cluster-deployer/remote_host.py
similarity index 100%
rename from test/tools/clustering/cluster-deployer/remote_host.py
rename to tools/clustering/cluster-deployer/remote_host.py

diff --git a/test/tools/clustering/cluster-deployer/restart.py b/tools/clustering/cluster-deployer/restart.py
similarity index 100%
rename from test/tools/clustering/cluster-deployer/restart.py
rename to tools/clustering/cluster-deployer/restart.py

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/akka.conf.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/akka.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/akka.conf.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/akka.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/jolokia.xml.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/jolokia.xml.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/jolokia.xml.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/jolokia.xml.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/module-shards.conf.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/module-shards.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/module-shards.conf.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/module-shards.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/modules.conf.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/modules.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/modules.conf.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/modules.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.features.cfg.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.features.cfg.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.features.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.management.cfg.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.management.cfg.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/org.apache.karaf.management.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.opendaylight.controller.cluster.datastore.cfg.template b/tools/clustering/cluster-deployer/templates/dsbenchmark/org.opendaylight.controller.cluster.datastore.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/dsbenchmark/org.opendaylight.controller.cluster.datastore.cfg.template
rename to tools/clustering/cluster-deployer/templates/dsbenchmark/org.opendaylight.controller.cluster.datastore.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/akka.conf.template b/tools/clustering/cluster-deployer/templates/exploratory/akka.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/akka.conf.template
rename to tools/clustering/cluster-deployer/templates/exploratory/akka.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/jolokia.xml.template b/tools/clustering/cluster-deployer/templates/exploratory/jolokia.xml.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/jolokia.xml.template
rename to tools/clustering/cluster-deployer/templates/exploratory/jolokia.xml.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/module-shards.conf.template b/tools/clustering/cluster-deployer/templates/exploratory/module-shards.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/module-shards.conf.template
rename to tools/clustering/cluster-deployer/templates/exploratory/module-shards.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/modules.conf.template b/tools/clustering/cluster-deployer/templates/exploratory/modules.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/modules.conf.template
rename to tools/clustering/cluster-deployer/templates/exploratory/modules.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.features.cfg.template b/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.features.cfg.template
rename to tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.features.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.management.cfg.template b/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.management.cfg.template
rename to tools/clustering/cluster-deployer/templates/exploratory/org.apache.karaf.management.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/akka.conf.template b/tools/clustering/cluster-deployer/templates/lithium_all/akka.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/akka.conf.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/akka.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/jolokia.xml.template b/tools/clustering/cluster-deployer/templates/lithium_all/jolokia.xml.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/jolokia.xml.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/jolokia.xml.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/module-shards.conf.template b/tools/clustering/cluster-deployer/templates/lithium_all/module-shards.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/module-shards.conf.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/module-shards.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/modules.conf.template b/tools/clustering/cluster-deployer/templates/lithium_all/modules.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/modules.conf.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/modules.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.features.cfg.template b/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.features.cfg.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.features.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.management.cfg.template b/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.management.cfg.template
rename to tools/clustering/cluster-deployer/templates/lithium_all/org.apache.karaf.management.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template b/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/akka.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template b/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/jolokia.xml.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template b/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/module-shards.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template b/tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/modules.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template b/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.features.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template b/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template
rename to tools/clustering/cluster-deployer/templates/multi-node-test/org.apache.karaf.management.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template b/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/akka.conf.template
rename to tools/clustering/cluster-deployer/templates/openflow/akka.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template b/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template
rename to tools/clustering/cluster-deployer/templates/openflow/jolokia.xml.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template b/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template
rename to tools/clustering/cluster-deployer/templates/openflow/module-shards.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template b/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/modules.conf.template
rename to tools/clustering/cluster-deployer/templates/openflow/modules.conf.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template b/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template
rename to tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.features.cfg.template

diff --git a/test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template b/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template
similarity index 100%
rename from test/tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template
rename to tools/clustering/cluster-deployer/templates/openflow/org.apache.karaf.management.cfg.template

diff --git a/test/tools/clustering/cluster-monitor/README.markdown b/tools/clustering/cluster-monitor/README.markdown
similarity index 100%
rename from test/tools/clustering/cluster-monitor/README.markdown
rename to tools/clustering/cluster-monitor/README.markdown

diff --git a/test/tools/clustering/cluster-monitor/cluster.json b/tools/clustering/cluster-monitor/cluster.json
similarity index 100%
rename from test/tools/clustering/cluster-monitor/cluster.json
rename to tools/clustering/cluster-monitor/cluster.json

diff --git a/test/tools/clustering/cluster-monitor/isolate.py b/tools/clustering/cluster-monitor/isolate.py
similarity index 100%
rename from test/tools/clustering/cluster-monitor/isolate.py
rename to tools/clustering/cluster-monitor/isolate.py

diff --git a/test/tools/clustering/cluster-monitor/monitor.py b/tools/clustering/cluster-monitor/monitor.py
similarity index 100%
rename from test/tools/clustering/cluster-monitor/monitor.py
rename to tools/clustering/cluster-monitor/monitor.py

diff --git a/test/tools/clustering/cluster-monitor/rejoin.py b/tools/clustering/cluster-monitor/rejoin.py
similarity index 100%
rename from test/tools/clustering/cluster-monitor/rejoin.py
rename to tools/clustering/cluster-monitor/rejoin.py

diff --git a/test/tools/clustering/cluster-monitor/timed_isolation.py b/tools/clustering/cluster-monitor/timed_isolation.py
similarity index 100%
rename from test/tools/clustering/cluster-monitor/timed_isolation.py
rename to tools/clustering/cluster-monitor/timed_isolation.py

diff --git a/test/tools/fastbgp/play.py b/tools/fastbgp/play.py
similarity index 100%
rename from test/tools/fastbgp/play.py
rename to tools/fastbgp/play.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py b/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py
rename to tools/odl-mdsal-clustering-tests/clustering-functional-test/crud.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/settings.py b/tools/odl-mdsal-clustering-tests/clustering-functional-test/settings.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-functional-test/settings.py
rename to tools/odl-mdsal-clustering-tests/clustering-functional-test/settings.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py b/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py
rename to tools/odl-mdsal-clustering-tests/clustering-functional-test/util.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/README b/tools/odl-mdsal-clustering-tests/clustering-performance-test/README
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/README
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/README

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/config_cleanup.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/config_cleanup.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/config_cleanup.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/config_cleanup.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/create_plot_data_files.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow-template.json b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow-template.json
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow-template.json
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow-template.json

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_add_delete_test.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_bulk.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_bulk.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_bulk.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_bulk.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_fle.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_fle.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_fle.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_config_blaster_fle.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_stats_stability_monitor.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_stats_stability_monitor.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_stats_stability_monitor.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/flow_stats_stability_monitor.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_crawler.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_perf.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_read_blaster.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_read_blaster.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_read_blaster.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/inventory_read_blaster.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/multi-blaster.sh b/tools/odl-mdsal-clustering-tests/clustering-performance-test/multi-blaster.sh
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/multi-blaster.sh
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/multi-blaster.sh

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/nicira-ext-all.json b/tools/odl-mdsal-clustering-tests/clustering-performance-test/nicira-ext-all.json
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/nicira-ext-all.json
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/nicira-ext-all.json

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13 b/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-flows.sh.13

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-tables.sh.13 b/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-tables.sh.13
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-tables.sh.13
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/OVS-dump-tables.sh.13

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/README b/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/README
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/README
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/README

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-found.sh b/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-found.sh
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-found.sh
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-found.sh

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-reported.sh b/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-reported.sh
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-reported.sh
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/ovs-scripts/get-total-reported.sh

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/pretty_print.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/pretty_print.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/pretty_print.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/pretty_print.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_multi_test.sh b/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_multi_test.sh
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_multi_test.sh
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_multi_test.sh

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py b/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py
rename to tools/odl-mdsal-clustering-tests/clustering-performance-test/shard_perf_test.py

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/pom.xml b/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/pom.xml
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/pom.xml
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/pom.xml

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml b/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/configuration/src/main/resources/initial/20-clustering-test-app.xml

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/pom.xml b/tools/odl-mdsal-clustering-tests/clustering-test-app/model/pom.xml
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/pom.xml
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/model/pom.xml

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-people.yang b/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-people.yang
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-people.yang
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-people.yang

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-purchase.yang b/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-purchase.yang
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-purchase.yang
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car-purchase.yang

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car.yang b/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car.yang
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car.yang
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/car.yang

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/people.yang b/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/people.yang
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/people.yang
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/model/src/main/yang/people.yang

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/pom.xml b/tools/odl-mdsal-clustering-tests/clustering-test-app/pom.xml
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/pom.xml
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/pom.xml

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/pom.xml b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/pom.xml
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/pom.xml
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/pom.xml

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/listener/PeopleCarListener.java b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/listener/PeopleCarListener.java
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/listener/PeopleCarListener.java
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/listener/PeopleCarListener.java

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PeopleProvider.java

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/clustering/it/provider/PurchaseCarProvider.java

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModule.java

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/java/org/opendaylight/controller/config/yang/config/clustering_it_provider/ClusteringItProviderModuleFactory.java

diff --git a/test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang b/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang
rename to tools/odl-mdsal-clustering-tests/clustering-test-app/provider/src/main/yang/clustering-it-provider.yang

diff --git a/test/tools/odl-mdsal-clustering-tests/config/module-shards.conf b/tools/odl-mdsal-clustering-tests/config/module-shards.conf
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/config/module-shards.conf
rename to tools/odl-mdsal-clustering-tests/config/module-shards.conf

diff --git a/test/tools/odl-mdsal-clustering-tests/config/modules.conf b/tools/odl-mdsal-clustering-tests/config/modules.conf
similarity index 100%
rename from test/tools/odl-mdsal-clustering-tests/config/modules.conf
rename to tools/odl-mdsal-clustering-tests/config/modules.conf

diff --git a/test/tools/odl-openstack-integration/Vagrantfile b/tools/odl-openstack-integration/Vagrantfile
similarity index 100%
rename from test/tools/odl-openstack-integration/Vagrantfile
rename to tools/odl-openstack-integration/Vagrantfile

diff --git a/test/tools/odl-openstack-integration/puppet/hiera.yaml b/tools/odl-openstack-integration/puppet/hiera.yaml
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/hiera.yaml
rename to tools/odl-openstack-integration/puppet/hiera.yaml

diff --git a/test/tools/odl-openstack-integration/puppet/hieradata/hosts.json b/tools/odl-openstack-integration/puppet/hieradata/hosts.json
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/hieradata/hosts.json
rename to tools/odl-openstack-integration/puppet/hieradata/hosts.json

diff --git a/test/tools/odl-openstack-integration/puppet/manifests/base.pp b/tools/odl-openstack-integration/puppet/manifests/base.pp
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/manifests/base.pp
rename to tools/odl-openstack-integration/puppet/manifests/base.pp

diff --git a/test/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp b/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp
rename to tools/odl-openstack-integration/puppet/manifests/devstack-compute.pp

diff --git a/test/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp b/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/manifests/devstack-control.pp
rename to tools/odl-openstack-integration/puppet/manifests/devstack-control.pp

diff --git a/test/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh b/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/scripts/bootstrap.sh
rename to tools/odl-openstack-integration/puppet/scripts/bootstrap.sh

diff --git a/test/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb b/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb
rename to tools/odl-openstack-integration/puppet/templates/compute.local.conf.erb

diff --git a/test/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb b/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/templates/control.local.conf.erb
rename to tools/odl-openstack-integration/puppet/templates/control.local.conf.erb

diff --git a/test/tools/odl-openstack-integration/puppet/templates/hosts.erb b/tools/odl-openstack-integration/puppet/templates/hosts.erb
similarity index 100%
rename from test/tools/odl-openstack-integration/puppet/templates/hosts.erb
rename to tools/odl-openstack-integration/puppet/templates/hosts.erb

diff --git a/test/tools/tools_vm/.gitignore b/tools/tools_vm/.gitignore
similarity index 100%
rename from test/tools/tools_vm/.gitignore
rename to tools/tools_vm/.gitignore

diff --git a/test/tools/tools_vm/Gemfile b/tools/tools_vm/Gemfile
similarity index 100%
rename from test/tools/tools_vm/Gemfile
rename to tools/tools_vm/Gemfile

diff --git a/test/tools/tools_vm/Puppetfile b/tools/tools_vm/Puppetfile
similarity index 100%
rename from test/tools/tools_vm/Puppetfile
rename to tools/tools_vm/Puppetfile

diff --git a/test/tools/tools_vm/README.md b/tools/tools_vm/README.md
similarity index 100%
rename from test/tools/tools_vm/README.md
rename to tools/tools_vm/README.md

diff --git a/test/tools/tools_vm/Vagrantfile b/tools/tools_vm/Vagrantfile
similarity index 100%
rename from test/tools/tools_vm/Vagrantfile
rename to tools/tools_vm/Vagrantfile

diff --git a/test/tools/tools_vm/manifests/odl_install.pp b/tools/tools_vm/manifests/odl_install.pp
similarity index 100%
rename from test/tools/tools_vm/manifests/odl_install.pp
rename to tools/tools_vm/manifests/odl_install.pp

diff --git a/test/tools/tools_vm/scripts/README.txt b/tools/tools_vm/scripts/README.txt
similarity index 100%
rename from test/tools/tools_vm/scripts/README.txt
rename to tools/tools_vm/scripts/README.txt

diff --git a/test/tools/tools_vm/scripts/connect.sh b/tools/tools_vm/scripts/connect.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/connect.sh
rename to tools/tools_vm/scripts/connect.sh

diff --git a/test/tools/tools_vm/scripts/fedora.sh b/tools/tools_vm/scripts/fedora.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/fedora.sh
rename to tools/tools_vm/scripts/fedora.sh

diff --git a/test/tools/tools_vm/scripts/run_test_base.sh b/tools/tools_vm/scripts/run_test_base.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/run_test_base.sh
rename to tools/tools_vm/scripts/run_test_base.sh

diff --git a/test/tools/tools_vm/scripts/run_test_base_self.sh b/tools/tools_vm/scripts/run_test_base_self.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/run_test_base_self.sh
rename to tools/tools_vm/scripts/run_test_base_self.sh

diff --git a/test/tools/tools_vm/scripts/start_mininet_cpqd.sh b/tools/tools_vm/scripts/start_mininet_cpqd.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/start_mininet_cpqd.sh
rename to tools/tools_vm/scripts/start_mininet_cpqd.sh

diff --git a/test/tools/tools_vm/scripts/start_mininet_of10.sh b/tools/tools_vm/scripts/start_mininet_of10.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/start_mininet_of10.sh
rename to tools/tools_vm/scripts/start_mininet_of10.sh

diff --git a/test/tools/tools_vm/scripts/start_mininet_of13.sh b/tools/tools_vm/scripts/start_mininet_of13.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/start_mininet_of13.sh
rename to tools/tools_vm/scripts/start_mininet_of13.sh

diff --git a/test/tools/tools_vm/scripts/start_vtn_coordinator.sh b/tools/tools_vm/scripts/start_vtn_coordinator.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/start_vtn_coordinator.sh
rename to tools/tools_vm/scripts/start_vtn_coordinator.sh

diff --git a/test/tools/tools_vm/scripts/stop_vtn_coordinator.sh b/tools/tools_vm/scripts/stop_vtn_coordinator.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/stop_vtn_coordinator.sh
rename to tools/tools_vm/scripts/stop_vtn_coordinator.sh

diff --git a/test/tools/tools_vm/scripts/ubuntu.sh b/tools/tools_vm/scripts/ubuntu.sh
similarity index 100%
rename from test/tools/tools_vm/scripts/ubuntu.sh
rename to tools/tools_vm/scripts/ubuntu.sh

diff --git a/test/tools/tools_vm/scripts/welcome.txt b/tools/tools_vm/scripts/welcome.txt
similarity index 100%
rename from test/tools/tools_vm/scripts/welcome.txt
rename to tools/tools_vm/scripts/welcome.txt

diff --git a/test/tools/wcbench/.gitignore b/tools/wcbench/.gitignore
similarity index 100%
rename from test/tools/wcbench/.gitignore
rename to tools/wcbench/.gitignore

diff --git a/test/tools/wcbench/README.md b/tools/wcbench/README.md
similarity index 100%
rename from test/tools/wcbench/README.md
rename to tools/wcbench/README.md

diff --git a/test/tools/wcbench/Vagrantfile b/tools/wcbench/Vagrantfile
similarity index 100%
rename from test/tools/wcbench/Vagrantfile
rename to tools/wcbench/Vagrantfile

diff --git a/test/tools/wcbench/loop_wcbench.sh b/tools/wcbench/loop_wcbench.sh
similarity index 100%
rename from test/tools/wcbench/loop_wcbench.sh
rename to tools/wcbench/loop_wcbench.sh

diff --git a/test/tools/wcbench/stats.py b/tools/wcbench/stats.py
similarity index 100%
rename from test/tools/wcbench/stats.py
rename to tools/wcbench/stats.py

diff --git a/test/tools/wcbench/wcbench.sh b/tools/wcbench/wcbench.sh
similarity index 100%
rename from test/tools/wcbench/wcbench.sh
rename to tools/wcbench/wcbench.sh

diff --git a/test/tox.ini b/tox.ini
similarity index 100%
rename from test/tox.ini
rename to tox.ini