Refactoring of OpenstackSwitching and OpenstackRouting

Change-Id: Ib7caea98006274dcdfebfe27c07e3533730ab23e
diff --git a/apps/pom.xml b/apps/pom.xml
index 3e3aebe..0aa0716 100644
--- a/apps/pom.xml
+++ b/apps/pom.xml
@@ -59,16 +59,15 @@
         <module>igmp</module>
         <module>pim</module>
         <module>mlb</module>
-        <module>openstackswitching</module>
         <module>pathpainter</module>
         <module>drivermatrix</module>
         <module>cpman</module>
         <module>events</module>
         <module>vrouter</module>
-        <module>openstackrouting</module>
         <module>cordmcast</module>
         <module>vpls</module>
         <module>openstacknode</module>
+        <module>openstacknetworking</module>
   </modules>
 
     <properties>