diff --git a/yang-mod-ver/draft-verdt-netmod-yang-module-versioning.txt b/yang-module-versioning/draft-verdt-netmod-yang-module-versioning.txt
similarity index 100%
rename from yang-mod-ver/draft-verdt-netmod-yang-module-versioning.txt
rename to yang-module-versioning/draft-verdt-netmod-yang-module-versioning.txt
diff --git a/yang-mod-ver/draft-verdt-netmod-yang-module-versioning.xml b/yang-module-versioning/draft-verdt-netmod-yang-module-versioning.xml
similarity index 100%
rename from yang-mod-ver/draft-verdt-netmod-yang-module-versioning.xml
rename to yang-module-versioning/draft-verdt-netmod-yang-module-versioning.xml
diff --git a/yang-mod-ver/ietf-yang-revisions.yang b/yang-module-versioning/ietf-yang-revisions.yang
similarity index 100%
rename from yang-mod-ver/ietf-yang-revisions.yang
rename to yang-module-versioning/ietf-yang-revisions.yang
diff --git a/yang-mod-ver/ietf-yl-revisions.yang b/yang-module-versioning/ietf-yl-revisions.yang
similarity index 100%
rename from yang-mod-ver/ietf-yl-revisions.yang
rename to yang-module-versioning/ietf-yl-revisions.yang
diff --git a/yang-pkgs/draft-rwilton-netmod-yang-packages.txt b/yang-packages/draft-rwilton-netmod-yang-packages.txt
similarity index 100%
rename from yang-pkgs/draft-rwilton-netmod-yang-packages.txt
rename to yang-packages/draft-rwilton-netmod-yang-packages.txt
diff --git a/yang-pkgs/draft-rwilton-netmod-yang-packages.xml b/yang-packages/draft-rwilton-netmod-yang-packages.xml
similarity index 100%
rename from yang-pkgs/draft-rwilton-netmod-yang-packages.xml
rename to yang-packages/draft-rwilton-netmod-yang-packages.xml
diff --git a/yang-pkgs/example-3-pkg.json b/yang-packages/example-3-pkg.json
similarity index 100%
rename from yang-pkgs/example-3-pkg.json
rename to yang-packages/example-3-pkg.json
diff --git a/yang-pkgs/example-ietf-network-device-pkg-folded.json b/yang-packages/example-ietf-network-device-pkg-folded.json
similarity index 100%
rename from yang-pkgs/example-ietf-network-device-pkg-folded.json
rename to yang-packages/example-ietf-network-device-pkg-folded.json
diff --git a/yang-pkgs/example-ietf-network-device-pkg.json b/yang-packages/example-ietf-network-device-pkg.json
similarity index 100%
rename from yang-pkgs/example-ietf-network-device-pkg.json
rename to yang-packages/example-ietf-network-device-pkg.json
diff --git a/yang-pkgs/example-ietf-routing-pkg-folded.json b/yang-packages/example-ietf-routing-pkg-folded.json
similarity index 100%
rename from yang-pkgs/example-ietf-routing-pkg-folded.json
rename to yang-packages/example-ietf-routing-pkg-folded.json
diff --git a/yang-pkgs/example-ietf-routing-pkg.json b/yang-packages/example-ietf-routing-pkg.json
similarity index 100%
rename from yang-pkgs/example-ietf-routing-pkg.json
rename to yang-packages/example-ietf-routing-pkg.json
diff --git a/yang-pkgs/example-import-1-pkg.json b/yang-packages/example-import-1-pkg.json
similarity index 100%
rename from yang-pkgs/example-import-1-pkg.json
rename to yang-packages/example-import-1-pkg.json
diff --git a/yang-pkgs/example-import-2-pkg.json b/yang-packages/example-import-2-pkg.json
similarity index 100%
rename from yang-pkgs/example-import-2-pkg.json
rename to yang-packages/example-import-2-pkg.json
diff --git a/yang-pkgs/full-example-ietf-network-device-pkg.json b/yang-packages/full-example-ietf-network-device-pkg.json
similarity index 100%
rename from yang-pkgs/full-example-ietf-network-device-pkg.json
rename to yang-packages/full-example-ietf-network-device-pkg.json
diff --git a/yang-pkgs/ietf-yang-inst-data-pkg.yang b/yang-packages/ietf-yang-inst-data-pkg.yang
similarity index 100%
rename from yang-pkgs/ietf-yang-inst-data-pkg.yang
rename to yang-packages/ietf-yang-inst-data-pkg.yang
diff --git a/yang-pkgs/ietf-yang-package-instance.yang b/yang-packages/ietf-yang-package-instance.yang
similarity index 100%
rename from yang-pkgs/ietf-yang-package-instance.yang
rename to yang-packages/ietf-yang-package-instance.yang
diff --git a/yang-pkgs/ietf-yang-package-types.yang b/yang-packages/ietf-yang-package-types.yang
similarity index 100%
rename from yang-pkgs/ietf-yang-package-types.yang
rename to yang-packages/ietf-yang-package-types.yang
diff --git a/yang-pkgs/ietf-yang-packages.yang b/yang-packages/ietf-yang-packages.yang
similarity index 100%
rename from yang-pkgs/ietf-yang-packages.yang
rename to yang-packages/ietf-yang-packages.yang
diff --git a/yang-pkgs/ietf-yl-packages.yang b/yang-packages/ietf-yl-packages.yang
similarity index 100%
rename from yang-pkgs/ietf-yl-packages.yang
rename to yang-packages/ietf-yl-packages.yang
diff --git a/yang-pkgs/simple-example-ietf-network-device-pkg.json b/yang-packages/simple-example-ietf-network-device-pkg.json
similarity index 100%
rename from yang-pkgs/simple-example-ietf-network-device-pkg.json
rename to yang-packages/simple-example-ietf-network-device-pkg.json
diff --git a/yang-pkgs/tools/example-ietf-network-device-pkg-folded.json b/yang-packages/tools/example-ietf-network-device-pkg-folded.json
similarity index 100%
rename from yang-pkgs/tools/example-ietf-network-device-pkg-folded.json
rename to yang-packages/tools/example-ietf-network-device-pkg-folded.json
diff --git a/yang-pkgs/tools/example-ietf-network-device-pkg.json b/yang-packages/tools/example-ietf-network-device-pkg.json
similarity index 100%
rename from yang-pkgs/tools/example-ietf-network-device-pkg.json
rename to yang-packages/tools/example-ietf-network-device-pkg.json
diff --git a/yang-pkgs/tools/example-ietf-routing-pkg.json b/yang-packages/tools/example-ietf-routing-pkg.json
similarity index 100%
rename from yang-pkgs/tools/example-ietf-routing-pkg.json
rename to yang-packages/tools/example-ietf-routing-pkg.json
diff --git a/yang-pkgs/tools/fold-artwork.sh b/yang-packages/tools/fold-artwork.sh
similarity index 100%
rename from yang-pkgs/tools/fold-artwork.sh
rename to yang-packages/tools/fold-artwork.sh
diff --git a/yang-ver-selection/draft-wilton-netmod-yang-ver-selection.txt b/yang-schema-selection/draft-wilton-netmod-yang-ver-selection.txt
similarity index 100%
rename from yang-ver-selection/draft-wilton-netmod-yang-ver-selection.txt
rename to yang-schema-selection/draft-wilton-netmod-yang-ver-selection.txt
diff --git a/yang-ver-selection/draft-wilton-netmod-yang-ver-selection.xml b/yang-schema-selection/draft-wilton-netmod-yang-ver-selection.xml
similarity index 100%
rename from yang-ver-selection/draft-wilton-netmod-yang-ver-selection.xml
rename to yang-schema-selection/draft-wilton-netmod-yang-ver-selection.xml
diff --git a/yang-ver-selection/ietf-schema-selection.yang b/yang-schema-selection/ietf-schema-selection.yang
similarity index 100%
rename from yang-ver-selection/ietf-schema-selection.yang
rename to yang-schema-selection/ietf-schema-selection.yang
diff --git a/yang-ver-selection/ietf-schema-version-selection.yang b/yang-schema-selection/ietf-schema-version-selection.yang
similarity index 100%
rename from yang-ver-selection/ietf-schema-version-selection.yang
rename to yang-schema-selection/ietf-schema-version-selection.yang
diff --git a/yang-solutions/draft-verdt-netmod-yang-solutions.txt b/yang-solution-overview/draft-verdt-netmod-yang-solutions.txt
similarity index 100%
rename from yang-solutions/draft-verdt-netmod-yang-solutions.txt
rename to yang-solution-overview/draft-verdt-netmod-yang-solutions.txt
diff --git a/yang-solutions/draft-verdt-netmod-yang-solutions.xml b/yang-solution-overview/draft-verdt-netmod-yang-solutions.xml
similarity index 100%
rename from yang-solutions/draft-verdt-netmod-yang-solutions.xml
rename to yang-solution-overview/draft-verdt-netmod-yang-solutions.xml
diff --git a/draft-ietf-netmod-yang-versioning-reqs.txt b/yang-versioning-reqs/draft-ietf-netmod-yang-versioning-reqs.txt
similarity index 100%
rename from draft-ietf-netmod-yang-versioning-reqs.txt
rename to yang-versioning-reqs/draft-ietf-netmod-yang-versioning-reqs.txt
diff --git a/draft-ietf-netmod-yang-versioning-reqs.xml b/yang-versioning-reqs/draft-ietf-netmod-yang-versioning-reqs.xml
similarity index 100%
rename from draft-ietf-netmod-yang-versioning-reqs.xml
rename to yang-versioning-reqs/draft-ietf-netmod-yang-versioning-reqs.xml