diff --git a/features/features.xml b/features/features.xml
index 2bf0365..0a9728d 100644
--- a/features/features.xml
+++ b/features/features.xml
@@ -155,13 +155,7 @@
         <bundle>mvn:org.onosproject/onos-of-provider-group/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-tvue" version="@FEATURE-VERSION"
-             description="ONOS sample topology viewer application">
-        <feature>onos-api</feature>
-        <feature>onos-thirdparty-web</feature>
-        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle>
-    </feature>
+    <!-- ONOS built-in apps -->
 
     <feature name="onos-app-fwd" version="@FEATURE-VERSION"
              description="ONOS sample forwarding application">
@@ -169,12 +163,6 @@
         <bundle>mvn:org.onosproject/onos-app-fwd/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-ifwd" version="@FEATURE-VERSION"
-             description="ONOS sample forwarding application using intents">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-ifwd/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-mobility" version="@FEATURE-VERSION"
              description="ONOS sample mobility application">
         <feature>onos-api</feature>
@@ -187,13 +175,6 @@
         <bundle>mvn:org.onosproject/onos-app-proxyarp/@ONOS-VERSION</bundle>
     </feature>
 
-    <feature name="onos-app-foo" version="@FEATURE-VERSION"
-             description="ONOS sample playground application">
-        <feature>onos-api</feature>
-        <bundle>mvn:org.onosproject/onos-app-foo/@ONOS-VERSION</bundle>
-        <bundle>mvn:org.onosproject/onlab-netty/@ONOS-VERSION</bundle>
-    </feature>
-
     <feature name="onos-app-config" version="@FEATURE-VERSION"
              description="ONOS network config reader">
         <feature>onos-api</feature>
@@ -222,15 +203,8 @@
         <feature>onos-app-proxyarp</feature>
         <feature>onos-app-config</feature>
         <bundle>mvn:org.onosproject/onos-app-bgprouter/@ONOS-VERSION</bundle>
-	<bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
-	<bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
-    </feature>
-
-    <feature name="onos-app-calendar" version="@FEATURE-VERSION"
-             description="REST interface for scheduling intents from an external calendar">
-        <feature>onos-api</feature>
-        <feature>onos-thirdparty-web</feature>
-        <bundle>mvn:org.onosproject/onos-app-calendar/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-routing-api/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-routing/@ONOS-VERSION</bundle>
     </feature>
 
     <feature name="onos-app-metrics" version="@FEATURE-VERSION"
@@ -251,6 +225,22 @@
         <bundle>mvn:org.onosproject/onos-app-metrics-topology/@ONOS-VERSION</bundle>
     </feature>
 
+    <!-- Sample apps: to be moved to a different repo -->
+
+    <feature name="onos-app-tvue" version="@FEATURE-VERSION"
+             description="ONOS sample topology viewer application">
+        <feature>onos-api</feature>
+        <feature>onos-thirdparty-web</feature>
+        <bundle>mvn:org.onosproject/onlab-rest/@ONOS-VERSION</bundle>
+        <bundle>mvn:org.onosproject/onos-app-tvue/@ONOS-VERSION</bundle>
+    </feature>
+
+    <feature name="onos-app-ifwd" version="@FEATURE-VERSION"
+             description="ONOS sample forwarding application using intents">
+        <feature>onos-api</feature>
+        <bundle>mvn:org.onosproject/onos-app-ifwd/@ONOS-VERSION</bundle>
+    </feature>
+
     <feature name="onos-app-demo" version="@FEATURE-VERSION"
              description="ONOS demo applications">
         <feature>onos-api</feature>
@@ -276,4 +266,11 @@
         <bundle>mvn:org.onosproject/onos-app-election/@ONOS-VERSION</bundle>
     </feature>
 
+    <feature name="onos-app-calendar" version="@FEATURE-VERSION"
+             description="REST interface for scheduling intents from an external calendar">
+        <feature>onos-api</feature>
+        <feature>onos-thirdparty-web</feature>
+        <bundle>mvn:org.onosproject/onos-app-calendar/@ONOS-VERSION</bundle>
+    </feature>
+
 </features>