reorganize orchestration, WIP
Change-Id: Iaf1765b648cb66437140a8c4615f52062aba345d
diff --git a/default.xml b/default.xml
index e454231..f7a3601 100644
--- a/default.xml
+++ b/default.xml
@@ -24,19 +24,20 @@
<project path="test/cord-tester" name="cord-tester" groups="test"/>
<project path="test/fabric-oftest" name="fabric-oftest" groups="test"/>
-<project path="orchestration" name="xos" groups="orchestration"/>
+<project path="orchestration/xos" name="xos" groups="orchestration"/>
<project path="orchestration/service-profile" name="service-profile" groups="orchestration"/>
-<project path="orchestration/xos-services/exampleservice" name="exampleservice" groups="services"/>
-<project path="orchestration/xos-services/fabric" name="fabric" groups="services"/>
-<project path="orchestration/xos-services/hypercache" name="hypercache" groups="services"/>
-<project path="orchestration/xos-services/metro-net" name="metro-net" groups="services"/>
-<project path="orchestration/xos-services/monitoring" name="monitoring" groups="services"/>
-<project path="orchestration/xos-services/ng-xos-lib" name="ng-xos-lib" groups="services"/>
-<project path="orchestration/xos-services/onos-service" name="onos-service" groups="services"/>
-<project path="orchestration/xos-services/openstack" name="openstack" groups="services"/>
-<project path="orchestration/xos-services/vrouter" name="vrouter" groups="services"/>
-<project path="orchestration/xos-services/vsg" name="vsg" groups="services"/>
-<project path="orchestration/xos-services/vtr" name="vtr" groups="services"/>
+<project path="orchestration/xos-services/exampleservice" name="exampleservice" groups="orchestration,services"/>
+<project path="orchestration/xos-services/fabric" name="fabric" groups="orchestration,services"/>
+<project path="orchestration/xos-services/hypercache" name="hypercache" groups="orchestration,services"/>
+<project path="orchestration/xos-services/metro-net" name="metro-net" groups="orchestration,services"/>
+<project path="orchestration/xos-services/monitoring" name="monitoring" groups="orchestration,services"/>
+<project path="orchestration/xos-services/ng-xos-lib" name="ng-xos-lib" groups="orchestration,services"/>
+<project path="orchestration/xos-services/onos-service" name="onos-service" groups="orchestration,services"/>
+<project path="orchestration/xos-services/openstack" name="openstack" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vrouter" name="vrouter" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vsg" name="vsg" groups="orchestration,services"/>
+<project path="orchestration/xos-services/vtr" name="vtr" groups="orchestration,services"/>
+<project path="orchestration/xos-libraries/ng-xos-lib" name="ng-xos-lib" groups="orchestration,libraries"/>
<project path="incubator/voltha" name="voltha" groups="incubation"/>