diff --git a/config-models/aether-2.0.x/files/aether-2.0.0.tree b/config-models/aether-2.0.x/files/aether-2.0.0.tree
index 38547ac..845cf7d 100644
--- a/config-models/aether-2.0.x/files/aether-2.0.0.tree
+++ b/config-models/aether-2.0.x/files/aether-2.0.0.tree
@@ -127,17 +127,17 @@
            |     +--rw uplink-burst-size?     at:burst
            |     +--rw downlink-burst-size?   at:burst
            +--rw device-group* [dg-id]
-           |  +--rw dg-id           device-group-id
-           |  +--rw description?    at:description
-           |  +--rw display-name?   string
+           |  +--rw dg-id            device-group-id
+           |  +--rw description?     at:description
+           |  +--rw display-name?    string
            |  +--rw device* [device-id]
            |  |  +--rw device-id    -> ../../../device/dev-id
            |  |  +--rw enable?      boolean
-           |  +--rw ip-domain?      -> ../../ip-domain/ip-id
+           |  +--rw ip-domain?       -> ../../ip-domain/ip-id
            |  +--rw mbr
-           |     +--rw uplink           at:bitrate
-           |     +--rw traffic-class    -> ../../../../traffic-class/tc-id
-           |     +--rw downlink         at:bitrate
+           |  |  +--rw uplink      at:bitrate
+           |  |  +--rw downlink    at:bitrate
+           |  +--rw traffic-class    -> ../../../traffic-class/tc-id
            +--rw ip-domain* [ip-id]
               +--rw ip-id            ip-domain-id
               +--rw display-name?    string
@@ -148,3 +148,4 @@
               +--rw admin-status?    at:admin-status
               +--rw mtu?             at:mtu
               +--rw description?     at:description
+
diff --git a/config-models/aether-2.0.x/files/yang/onf-device-group.yang b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
index b57e8db..2e01e17 100755
--- a/config-models/aether-2.0.x/files/yang/onf-device-group.yang
+++ b/config-models/aether-2.0.x/files/yang/onf-device-group.yang
@@ -103,15 +103,6 @@
           description "Per-device MBR uplink data rate in bps";
         }
 
-        leaf traffic-class {
-          type leafref {
-            path "../../../../traffic-class/tc-id";
-          }
-          mandatory true;
-          description
-            "Link to traffic class";
-        }
-
         leaf downlink {
           type at:bitrate;
           units bps;
@@ -119,6 +110,15 @@
           description "Per-device MBR downlink data rate in bps";
         }
       }
+
+      leaf traffic-class {
+        type leafref {
+          path "../../../traffic-class/tc-id";
+        }
+        mandatory true;
+        description
+          "Link to traffic class";
+      }
     }
   }
 }