diff --git a/demos/angular/.angular-cli.json b/angular/test/nav/.angular-cli.json
similarity index 100%
rename from demos/angular/.angular-cli.json
rename to angular/test/nav/.angular-cli.json
diff --git a/demos/angular/.editorconfig b/angular/test/nav/.editorconfig
similarity index 100%
rename from demos/angular/.editorconfig
rename to angular/test/nav/.editorconfig
diff --git a/demos/angular/.gitignore b/angular/test/nav/.gitignore
similarity index 100%
rename from demos/angular/.gitignore
rename to angular/test/nav/.gitignore
diff --git a/demos/angular/README.md b/angular/test/nav/README.md
similarity index 100%
rename from demos/angular/README.md
rename to angular/test/nav/README.md
diff --git a/demos/angular/e2e/action-sheet.e2e-spec.ts b/angular/test/nav/e2e/action-sheet.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/action-sheet.e2e-spec.ts
rename to angular/test/nav/e2e/action-sheet.e2e-spec.ts
diff --git a/demos/angular/e2e/action-sheet.po.ts b/angular/test/nav/e2e/action-sheet.po.ts
similarity index 100%
rename from demos/angular/e2e/action-sheet.po.ts
rename to angular/test/nav/e2e/action-sheet.po.ts
diff --git a/demos/angular/e2e/alert.e2e-spec.ts b/angular/test/nav/e2e/alert.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/alert.e2e-spec.ts
rename to angular/test/nav/e2e/alert.e2e-spec.ts
diff --git a/demos/angular/e2e/alert.po.ts b/angular/test/nav/e2e/alert.po.ts
similarity index 100%
rename from demos/angular/e2e/alert.po.ts
rename to angular/test/nav/e2e/alert.po.ts
diff --git a/demos/angular/e2e/basic-inputs.e2e-spec.ts b/angular/test/nav/e2e/basic-inputs.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/basic-inputs.e2e-spec.ts
rename to angular/test/nav/e2e/basic-inputs.e2e-spec.ts
diff --git a/demos/angular/e2e/basic-inputs.po.ts b/angular/test/nav/e2e/basic-inputs.po.ts
similarity index 100%
rename from demos/angular/e2e/basic-inputs.po.ts
rename to angular/test/nav/e2e/basic-inputs.po.ts
diff --git a/demos/angular/e2e/group-inputs.e2e-spec.ts b/angular/test/nav/e2e/group-inputs.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/group-inputs.e2e-spec.ts
rename to angular/test/nav/e2e/group-inputs.e2e-spec.ts
diff --git a/demos/angular/e2e/group-inputs.po.ts b/angular/test/nav/e2e/group-inputs.po.ts
similarity index 100%
rename from demos/angular/e2e/group-inputs.po.ts
rename to angular/test/nav/e2e/group-inputs.po.ts
diff --git a/demos/angular/e2e/home.e2e-spec.ts b/angular/test/nav/e2e/home.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/home.e2e-spec.ts
rename to angular/test/nav/e2e/home.e2e-spec.ts
diff --git a/demos/angular/e2e/home.po.ts b/angular/test/nav/e2e/home.po.ts
similarity index 100%
rename from demos/angular/e2e/home.po.ts
rename to angular/test/nav/e2e/home.po.ts
diff --git a/demos/angular/e2e/loading.e2e-spec.ts b/angular/test/nav/e2e/loading.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/loading.e2e-spec.ts
rename to angular/test/nav/e2e/loading.e2e-spec.ts
diff --git a/demos/angular/e2e/loading.po.ts b/angular/test/nav/e2e/loading.po.ts
similarity index 100%
rename from demos/angular/e2e/loading.po.ts
rename to angular/test/nav/e2e/loading.po.ts
diff --git a/demos/angular/e2e/modal.e2e-spec.ts b/angular/test/nav/e2e/modal.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/modal.e2e-spec.ts
rename to angular/test/nav/e2e/modal.e2e-spec.ts
diff --git a/demos/angular/e2e/modal.po.ts b/angular/test/nav/e2e/modal.po.ts
similarity index 100%
rename from demos/angular/e2e/modal.po.ts
rename to angular/test/nav/e2e/modal.po.ts
diff --git a/demos/angular/e2e/popover.e2e-spec.ts b/angular/test/nav/e2e/popover.e2e-spec.ts
similarity index 100%
rename from demos/angular/e2e/popover.e2e-spec.ts
rename to angular/test/nav/e2e/popover.e2e-spec.ts
diff --git a/demos/angular/e2e/popover.po.ts b/angular/test/nav/e2e/popover.po.ts
similarity index 100%
rename from demos/angular/e2e/popover.po.ts
rename to angular/test/nav/e2e/popover.po.ts
diff --git a/demos/angular/e2e/tsconfig.e2e.json b/angular/test/nav/e2e/tsconfig.e2e.json
similarity index 100%
rename from demos/angular/e2e/tsconfig.e2e.json
rename to angular/test/nav/e2e/tsconfig.e2e.json
diff --git a/demos/angular/e2e/utils/helpers.ts b/angular/test/nav/e2e/utils/helpers.ts
similarity index 100%
rename from demos/angular/e2e/utils/helpers.ts
rename to angular/test/nav/e2e/utils/helpers.ts
diff --git a/demos/angular/karma.conf.js b/angular/test/nav/karma.conf.js
similarity index 100%
rename from demos/angular/karma.conf.js
rename to angular/test/nav/karma.conf.js
diff --git a/demos/angular/package-lock.json b/angular/test/nav/package-lock.json
similarity index 100%
rename from demos/angular/package-lock.json
rename to angular/test/nav/package-lock.json
diff --git a/demos/angular/package.json b/angular/test/nav/package.json
similarity index 100%
rename from demos/angular/package.json
rename to angular/test/nav/package.json
diff --git a/demos/angular/protractor.conf.js b/angular/test/nav/protractor.conf.js
similarity index 100%
rename from demos/angular/protractor.conf.js
rename to angular/test/nav/protractor.conf.js
diff --git a/demos/angular/server/server.ts b/angular/test/nav/server/server.ts
similarity index 100%
rename from demos/angular/server/server.ts
rename to angular/test/nav/server/server.ts
diff --git a/demos/angular/src/app/action-sheet/action-sheet-page.component.ts b/angular/test/nav/src/app/action-sheet/action-sheet-page.component.ts
similarity index 100%
rename from demos/angular/src/app/action-sheet/action-sheet-page.component.ts
rename to angular/test/nav/src/app/action-sheet/action-sheet-page.component.ts
diff --git a/demos/angular/src/app/action-sheet/action-sheet-routing.module.ts b/angular/test/nav/src/app/action-sheet/action-sheet-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/action-sheet/action-sheet-routing.module.ts
rename to angular/test/nav/src/app/action-sheet/action-sheet-routing.module.ts
diff --git a/demos/angular/src/app/action-sheet/action-sheet.module.ts b/angular/test/nav/src/app/action-sheet/action-sheet.module.ts
similarity index 100%
rename from demos/angular/src/app/action-sheet/action-sheet.module.ts
rename to angular/test/nav/src/app/action-sheet/action-sheet.module.ts
diff --git a/demos/angular/src/app/alert/alert-page.component.ts b/angular/test/nav/src/app/alert/alert-page.component.ts
similarity index 100%
rename from demos/angular/src/app/alert/alert-page.component.ts
rename to angular/test/nav/src/app/alert/alert-page.component.ts
diff --git a/demos/angular/src/app/alert/alert-routing.module.ts b/angular/test/nav/src/app/alert/alert-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/alert/alert-routing.module.ts
rename to angular/test/nav/src/app/alert/alert-routing.module.ts
diff --git a/demos/angular/src/app/alert/alert.module.ts b/angular/test/nav/src/app/alert/alert.module.ts
similarity index 100%
rename from demos/angular/src/app/alert/alert.module.ts
rename to angular/test/nav/src/app/alert/alert.module.ts
diff --git a/demos/angular/src/app/app-routing.module.ts b/angular/test/nav/src/app/app-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/app-routing.module.ts
rename to angular/test/nav/src/app/app-routing.module.ts
diff --git a/demos/angular/src/app/app.component.css b/angular/test/nav/src/app/app.component.css
similarity index 100%
rename from demos/angular/src/app/app.component.css
rename to angular/test/nav/src/app/app.component.css
diff --git a/demos/angular/src/app/app.component.html b/angular/test/nav/src/app/app.component.html
similarity index 100%
rename from demos/angular/src/app/app.component.html
rename to angular/test/nav/src/app/app.component.html
diff --git a/demos/angular/src/app/app.component.spec.ts b/angular/test/nav/src/app/app.component.spec.ts
similarity index 100%
rename from demos/angular/src/app/app.component.spec.ts
rename to angular/test/nav/src/app/app.component.spec.ts
diff --git a/demos/angular/src/app/app.component.ts b/angular/test/nav/src/app/app.component.ts
similarity index 100%
rename from demos/angular/src/app/app.component.ts
rename to angular/test/nav/src/app/app.component.ts
diff --git a/demos/angular/src/app/app.module.ts b/angular/test/nav/src/app/app.module.ts
similarity index 100%
rename from demos/angular/src/app/app.module.ts
rename to angular/test/nav/src/app/app.module.ts
diff --git a/demos/angular/src/app/badge/badge-page.component.ts b/angular/test/nav/src/app/badge/badge-page.component.ts
similarity index 100%
rename from demos/angular/src/app/badge/badge-page.component.ts
rename to angular/test/nav/src/app/badge/badge-page.component.ts
diff --git a/demos/angular/src/app/badge/badge-routing.module.ts b/angular/test/nav/src/app/badge/badge-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/badge/badge-routing.module.ts
rename to angular/test/nav/src/app/badge/badge-routing.module.ts
diff --git a/demos/angular/src/app/badge/badge.module.ts b/angular/test/nav/src/app/badge/badge.module.ts
similarity index 100%
rename from demos/angular/src/app/badge/badge.module.ts
rename to angular/test/nav/src/app/badge/badge.module.ts
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page-routing.module.ts
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.html b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.html
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.html
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.html
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.scss b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.scss
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.scss
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.scss
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.spec.ts
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.ts b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.ts
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page.component.ts
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.component.ts
diff --git a/demos/angular/src/app/basic-inputs-page/basic-inputs-page.module.ts b/angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.module.ts
similarity index 100%
rename from demos/angular/src/app/basic-inputs-page/basic-inputs-page.module.ts
rename to angular/test/nav/src/app/basic-inputs-page/basic-inputs-page.module.ts
diff --git a/demos/angular/src/app/card/card-page.component.ts b/angular/test/nav/src/app/card/card-page.component.ts
similarity index 100%
rename from demos/angular/src/app/card/card-page.component.ts
rename to angular/test/nav/src/app/card/card-page.component.ts
diff --git a/demos/angular/src/app/card/card-routing.module.ts b/angular/test/nav/src/app/card/card-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/card/card-routing.module.ts
rename to angular/test/nav/src/app/card/card-routing.module.ts
diff --git a/demos/angular/src/app/card/card.module.ts b/angular/test/nav/src/app/card/card.module.ts
similarity index 100%
rename from demos/angular/src/app/card/card.module.ts
rename to angular/test/nav/src/app/card/card.module.ts
diff --git a/demos/angular/src/app/content/content-page.component.ts b/angular/test/nav/src/app/content/content-page.component.ts
similarity index 100%
rename from demos/angular/src/app/content/content-page.component.ts
rename to angular/test/nav/src/app/content/content-page.component.ts
diff --git a/demos/angular/src/app/content/content-routing.module.ts b/angular/test/nav/src/app/content/content-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/content/content-routing.module.ts
rename to angular/test/nav/src/app/content/content-routing.module.ts
diff --git a/demos/angular/src/app/content/content.module.ts b/angular/test/nav/src/app/content/content.module.ts
similarity index 100%
rename from demos/angular/src/app/content/content.module.ts
rename to angular/test/nav/src/app/content/content.module.ts
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page-routing.module.ts b/angular/test/nav/src/app/form-sample-page/form-sample-page-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page-routing.module.ts
rename to angular/test/nav/src/app/form-sample-page/form-sample-page-routing.module.ts
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page.component.html b/angular/test/nav/src/app/form-sample-page/form-sample-page.component.html
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page.component.html
rename to angular/test/nav/src/app/form-sample-page/form-sample-page.component.html
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page.component.scss b/angular/test/nav/src/app/form-sample-page/form-sample-page.component.scss
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page.component.scss
rename to angular/test/nav/src/app/form-sample-page/form-sample-page.component.scss
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page.component.spec.ts b/angular/test/nav/src/app/form-sample-page/form-sample-page.component.spec.ts
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page.component.spec.ts
rename to angular/test/nav/src/app/form-sample-page/form-sample-page.component.spec.ts
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page.component.ts b/angular/test/nav/src/app/form-sample-page/form-sample-page.component.ts
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page.component.ts
rename to angular/test/nav/src/app/form-sample-page/form-sample-page.component.ts
diff --git a/demos/angular/src/app/form-sample-page/form-sample-page.module.ts b/angular/test/nav/src/app/form-sample-page/form-sample-page.module.ts
similarity index 100%
rename from demos/angular/src/app/form-sample-page/form-sample-page.module.ts
rename to angular/test/nav/src/app/form-sample-page/form-sample-page.module.ts
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts b/angular/test/nav/src/app/group-inputs-page/group-inputs-page-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page-routing.module.ts
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page-routing.module.ts
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page.component.html b/angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.html
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page.component.html
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.html
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page.component.scss b/angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.scss
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page.component.scss
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.scss
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page.component.spec.ts b/angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.spec.ts
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page.component.spec.ts
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.spec.ts
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page.component.ts b/angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.ts
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page.component.ts
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page.component.ts
diff --git a/demos/angular/src/app/group-inputs-page/group-inputs-page.module.ts b/angular/test/nav/src/app/group-inputs-page/group-inputs-page.module.ts
similarity index 100%
rename from demos/angular/src/app/group-inputs-page/group-inputs-page.module.ts
rename to angular/test/nav/src/app/group-inputs-page/group-inputs-page.module.ts
diff --git a/demos/angular/src/app/home-page/home-page-routing.module.ts b/angular/test/nav/src/app/home-page/home-page-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/home-page/home-page-routing.module.ts
rename to angular/test/nav/src/app/home-page/home-page-routing.module.ts
diff --git a/demos/angular/src/app/home-page/home-page.component.html b/angular/test/nav/src/app/home-page/home-page.component.html
similarity index 100%
rename from demos/angular/src/app/home-page/home-page.component.html
rename to angular/test/nav/src/app/home-page/home-page.component.html
diff --git a/demos/angular/src/app/home-page/home-page.component.scss b/angular/test/nav/src/app/home-page/home-page.component.scss
similarity index 100%
rename from demos/angular/src/app/home-page/home-page.component.scss
rename to angular/test/nav/src/app/home-page/home-page.component.scss
diff --git a/demos/angular/src/app/home-page/home-page.component.spec.ts b/angular/test/nav/src/app/home-page/home-page.component.spec.ts
similarity index 100%
rename from demos/angular/src/app/home-page/home-page.component.spec.ts
rename to angular/test/nav/src/app/home-page/home-page.component.spec.ts
diff --git a/demos/angular/src/app/home-page/home-page.component.ts b/angular/test/nav/src/app/home-page/home-page.component.ts
similarity index 100%
rename from demos/angular/src/app/home-page/home-page.component.ts
rename to angular/test/nav/src/app/home-page/home-page.component.ts
diff --git a/demos/angular/src/app/home-page/home-page.module.ts b/angular/test/nav/src/app/home-page/home-page.module.ts
similarity index 100%
rename from demos/angular/src/app/home-page/home-page.module.ts
rename to angular/test/nav/src/app/home-page/home-page.module.ts
diff --git a/demos/angular/src/app/loading/loading-page.component.ts b/angular/test/nav/src/app/loading/loading-page.component.ts
similarity index 100%
rename from demos/angular/src/app/loading/loading-page.component.ts
rename to angular/test/nav/src/app/loading/loading-page.component.ts
diff --git a/demos/angular/src/app/loading/loading-routing.module.ts b/angular/test/nav/src/app/loading/loading-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/loading/loading-routing.module.ts
rename to angular/test/nav/src/app/loading/loading-routing.module.ts
diff --git a/demos/angular/src/app/loading/loading.module.ts b/angular/test/nav/src/app/loading/loading.module.ts
similarity index 100%
rename from demos/angular/src/app/loading/loading.module.ts
rename to angular/test/nav/src/app/loading/loading.module.ts
diff --git a/demos/angular/src/app/modal/modal-page-to-present.ts b/angular/test/nav/src/app/modal/modal-page-to-present.ts
similarity index 100%
rename from demos/angular/src/app/modal/modal-page-to-present.ts
rename to angular/test/nav/src/app/modal/modal-page-to-present.ts
diff --git a/demos/angular/src/app/modal/modal-page.component.ts b/angular/test/nav/src/app/modal/modal-page.component.ts
similarity index 100%
rename from demos/angular/src/app/modal/modal-page.component.ts
rename to angular/test/nav/src/app/modal/modal-page.component.ts
diff --git a/demos/angular/src/app/modal/modal-routing.module.ts b/angular/test/nav/src/app/modal/modal-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/modal/modal-routing.module.ts
rename to angular/test/nav/src/app/modal/modal-routing.module.ts
diff --git a/demos/angular/src/app/modal/modal.module.ts b/angular/test/nav/src/app/modal/modal.module.ts
similarity index 100%
rename from demos/angular/src/app/modal/modal.module.ts
rename to angular/test/nav/src/app/modal/modal.module.ts
diff --git a/demos/angular/src/app/no-routing-nav/no-routing-nav-routing.module.ts b/angular/test/nav/src/app/no-routing-nav/no-routing-nav-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/no-routing-nav-routing.module.ts
rename to angular/test/nav/src/app/no-routing-nav/no-routing-nav-routing.module.ts
diff --git a/demos/angular/src/app/no-routing-nav/no-routing-nav.component.ts b/angular/test/nav/src/app/no-routing-nav/no-routing-nav.component.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/no-routing-nav.component.ts
rename to angular/test/nav/src/app/no-routing-nav/no-routing-nav.component.ts
diff --git a/demos/angular/src/app/no-routing-nav/no-routing-nav.module.ts b/angular/test/nav/src/app/no-routing-nav/no-routing-nav.module.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/no-routing-nav.module.ts
rename to angular/test/nav/src/app/no-routing-nav/no-routing-nav.module.ts
diff --git a/demos/angular/src/app/no-routing-nav/pages/page-one.ts b/angular/test/nav/src/app/no-routing-nav/pages/page-one.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/pages/page-one.ts
rename to angular/test/nav/src/app/no-routing-nav/pages/page-one.ts
diff --git a/demos/angular/src/app/no-routing-nav/pages/page-three.ts b/angular/test/nav/src/app/no-routing-nav/pages/page-three.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/pages/page-three.ts
rename to angular/test/nav/src/app/no-routing-nav/pages/page-three.ts
diff --git a/demos/angular/src/app/no-routing-nav/pages/page-two.ts b/angular/test/nav/src/app/no-routing-nav/pages/page-two.ts
similarity index 100%
rename from demos/angular/src/app/no-routing-nav/pages/page-two.ts
rename to angular/test/nav/src/app/no-routing-nav/pages/page-two.ts
diff --git a/demos/angular/src/app/popover/popover-page-to-present.ts b/angular/test/nav/src/app/popover/popover-page-to-present.ts
similarity index 100%
rename from demos/angular/src/app/popover/popover-page-to-present.ts
rename to angular/test/nav/src/app/popover/popover-page-to-present.ts
diff --git a/demos/angular/src/app/popover/popover-page.component.ts b/angular/test/nav/src/app/popover/popover-page.component.ts
similarity index 100%
rename from demos/angular/src/app/popover/popover-page.component.ts
rename to angular/test/nav/src/app/popover/popover-page.component.ts
diff --git a/demos/angular/src/app/popover/popover-routing.module.ts b/angular/test/nav/src/app/popover/popover-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/popover/popover-routing.module.ts
rename to angular/test/nav/src/app/popover/popover-routing.module.ts
diff --git a/demos/angular/src/app/popover/popover.module.ts b/angular/test/nav/src/app/popover/popover.module.ts
similarity index 100%
rename from demos/angular/src/app/popover/popover.module.ts
rename to angular/test/nav/src/app/popover/popover.module.ts
diff --git a/demos/angular/src/app/post-test/post-test.service.spec.ts b/angular/test/nav/src/app/post-test/post-test.service.spec.ts
similarity index 100%
rename from demos/angular/src/app/post-test/post-test.service.spec.ts
rename to angular/test/nav/src/app/post-test/post-test.service.spec.ts
diff --git a/demos/angular/src/app/post-test/post-test.service.ts b/angular/test/nav/src/app/post-test/post-test.service.ts
similarity index 100%
rename from demos/angular/src/app/post-test/post-test.service.ts
rename to angular/test/nav/src/app/post-test/post-test.service.ts
diff --git a/demos/angular/src/app/segment/segment-page.component.ts b/angular/test/nav/src/app/segment/segment-page.component.ts
similarity index 100%
rename from demos/angular/src/app/segment/segment-page.component.ts
rename to angular/test/nav/src/app/segment/segment-page.component.ts
diff --git a/demos/angular/src/app/segment/segment-routing.module.ts b/angular/test/nav/src/app/segment/segment-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/segment/segment-routing.module.ts
rename to angular/test/nav/src/app/segment/segment-routing.module.ts
diff --git a/demos/angular/src/app/segment/segment.module.ts b/angular/test/nav/src/app/segment/segment.module.ts
similarity index 100%
rename from demos/angular/src/app/segment/segment.module.ts
rename to angular/test/nav/src/app/segment/segment.module.ts
diff --git a/demos/angular/src/app/show-hide-when/show-hide-when-page.component.ts b/angular/test/nav/src/app/show-hide-when/show-hide-when-page.component.ts
similarity index 100%
rename from demos/angular/src/app/show-hide-when/show-hide-when-page.component.ts
rename to angular/test/nav/src/app/show-hide-when/show-hide-when-page.component.ts
diff --git a/demos/angular/src/app/show-hide-when/show-hide-when-routing.module.ts b/angular/test/nav/src/app/show-hide-when/show-hide-when-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/show-hide-when/show-hide-when-routing.module.ts
rename to angular/test/nav/src/app/show-hide-when/show-hide-when-routing.module.ts
diff --git a/demos/angular/src/app/show-hide-when/show-hide-when.html b/angular/test/nav/src/app/show-hide-when/show-hide-when.html
similarity index 100%
rename from demos/angular/src/app/show-hide-when/show-hide-when.html
rename to angular/test/nav/src/app/show-hide-when/show-hide-when.html
diff --git a/demos/angular/src/app/show-hide-when/show-hide-when.module.ts b/angular/test/nav/src/app/show-hide-when/show-hide-when.module.ts
similarity index 100%
rename from demos/angular/src/app/show-hide-when/show-hide-when.module.ts
rename to angular/test/nav/src/app/show-hide-when/show-hide-when.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-one/page-one-routing.module.ts b/angular/test/nav/src/app/simple-nav/page-one/page-one-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-one/page-one-routing.module.ts
rename to angular/test/nav/src/app/simple-nav/page-one/page-one-routing.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-one/page-one.module.ts b/angular/test/nav/src/app/simple-nav/page-one/page-one.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-one/page-one.module.ts
rename to angular/test/nav/src/app/simple-nav/page-one/page-one.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-one/page-one.ts b/angular/test/nav/src/app/simple-nav/page-one/page-one.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-one/page-one.ts
rename to angular/test/nav/src/app/simple-nav/page-one/page-one.ts
diff --git a/demos/angular/src/app/simple-nav/page-three/page-three-routing.module.ts b/angular/test/nav/src/app/simple-nav/page-three/page-three-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-three/page-three-routing.module.ts
rename to angular/test/nav/src/app/simple-nav/page-three/page-three-routing.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-three/page-three.module.ts b/angular/test/nav/src/app/simple-nav/page-three/page-three.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-three/page-three.module.ts
rename to angular/test/nav/src/app/simple-nav/page-three/page-three.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-three/page-three.ts b/angular/test/nav/src/app/simple-nav/page-three/page-three.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-three/page-three.ts
rename to angular/test/nav/src/app/simple-nav/page-three/page-three.ts
diff --git a/demos/angular/src/app/simple-nav/page-two/page-two-routing.module.ts b/angular/test/nav/src/app/simple-nav/page-two/page-two-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-two/page-two-routing.module.ts
rename to angular/test/nav/src/app/simple-nav/page-two/page-two-routing.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-two/page-two.module.ts b/angular/test/nav/src/app/simple-nav/page-two/page-two.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-two/page-two.module.ts
rename to angular/test/nav/src/app/simple-nav/page-two/page-two.module.ts
diff --git a/demos/angular/src/app/simple-nav/page-two/page-two.ts b/angular/test/nav/src/app/simple-nav/page-two/page-two.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/page-two/page-two.ts
rename to angular/test/nav/src/app/simple-nav/page-two/page-two.ts
diff --git a/demos/angular/src/app/simple-nav/simple-nav-routing.module.ts b/angular/test/nav/src/app/simple-nav/simple-nav-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/simple-nav-routing.module.ts
rename to angular/test/nav/src/app/simple-nav/simple-nav-routing.module.ts
diff --git a/demos/angular/src/app/simple-nav/simple-nav.component.ts b/angular/test/nav/src/app/simple-nav/simple-nav.component.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/simple-nav.component.ts
rename to angular/test/nav/src/app/simple-nav/simple-nav.component.ts
diff --git a/demos/angular/src/app/simple-nav/simple-nav.module.ts b/angular/test/nav/src/app/simple-nav/simple-nav.module.ts
similarity index 100%
rename from demos/angular/src/app/simple-nav/simple-nav.module.ts
rename to angular/test/nav/src/app/simple-nav/simple-nav.module.ts
diff --git a/demos/angular/src/app/toast/toast-page.component.ts b/angular/test/nav/src/app/toast/toast-page.component.ts
similarity index 100%
rename from demos/angular/src/app/toast/toast-page.component.ts
rename to angular/test/nav/src/app/toast/toast-page.component.ts
diff --git a/demos/angular/src/app/toast/toast-routing.module.ts b/angular/test/nav/src/app/toast/toast-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/toast/toast-routing.module.ts
rename to angular/test/nav/src/app/toast/toast-routing.module.ts
diff --git a/demos/angular/src/app/toast/toast.module.ts b/angular/test/nav/src/app/toast/toast.module.ts
similarity index 100%
rename from demos/angular/src/app/toast/toast.module.ts
rename to angular/test/nav/src/app/toast/toast.module.ts
diff --git a/demos/angular/src/app/virtual-scroll/virtual-scroll-page.component.ts b/angular/test/nav/src/app/virtual-scroll/virtual-scroll-page.component.ts
similarity index 100%
rename from demos/angular/src/app/virtual-scroll/virtual-scroll-page.component.ts
rename to angular/test/nav/src/app/virtual-scroll/virtual-scroll-page.component.ts
diff --git a/demos/angular/src/app/virtual-scroll/virtual-scroll-routing.module.ts b/angular/test/nav/src/app/virtual-scroll/virtual-scroll-routing.module.ts
similarity index 100%
rename from demos/angular/src/app/virtual-scroll/virtual-scroll-routing.module.ts
rename to angular/test/nav/src/app/virtual-scroll/virtual-scroll-routing.module.ts
diff --git a/demos/angular/src/app/virtual-scroll/virtual-scroll.module.ts b/angular/test/nav/src/app/virtual-scroll/virtual-scroll.module.ts
similarity index 100%
rename from demos/angular/src/app/virtual-scroll/virtual-scroll.module.ts
rename to angular/test/nav/src/app/virtual-scroll/virtual-scroll.module.ts
diff --git a/demos/angular/src/assets/.gitkeep b/angular/test/nav/src/assets/.gitkeep
similarity index 100%
rename from demos/angular/src/assets/.gitkeep
rename to angular/test/nav/src/assets/.gitkeep
diff --git a/demos/angular/src/environments/environment.prod.ts b/angular/test/nav/src/environments/environment.prod.ts
similarity index 100%
rename from demos/angular/src/environments/environment.prod.ts
rename to angular/test/nav/src/environments/environment.prod.ts
diff --git a/demos/angular/src/environments/environment.ts b/angular/test/nav/src/environments/environment.ts
similarity index 100%
rename from demos/angular/src/environments/environment.ts
rename to angular/test/nav/src/environments/environment.ts
diff --git a/demos/angular/src/favicon.ico b/angular/test/nav/src/favicon.ico
similarity index 100%
rename from demos/angular/src/favicon.ico
rename to angular/test/nav/src/favicon.ico
diff --git a/demos/angular/src/index.html b/angular/test/nav/src/index.html
similarity index 100%
rename from demos/angular/src/index.html
rename to angular/test/nav/src/index.html
diff --git a/demos/angular/src/main.ts b/angular/test/nav/src/main.ts
similarity index 100%
rename from demos/angular/src/main.ts
rename to angular/test/nav/src/main.ts
diff --git a/demos/angular/src/polyfills.ts b/angular/test/nav/src/polyfills.ts
similarity index 100%
rename from demos/angular/src/polyfills.ts
rename to angular/test/nav/src/polyfills.ts
diff --git a/demos/angular/src/styles.scss b/angular/test/nav/src/styles.scss
similarity index 100%
rename from demos/angular/src/styles.scss
rename to angular/test/nav/src/styles.scss
diff --git a/demos/angular/src/test.ts b/angular/test/nav/src/test.ts
similarity index 100%
rename from demos/angular/src/test.ts
rename to angular/test/nav/src/test.ts
diff --git a/demos/angular/src/tsconfig.app.json b/angular/test/nav/src/tsconfig.app.json
similarity index 100%
rename from demos/angular/src/tsconfig.app.json
rename to angular/test/nav/src/tsconfig.app.json
diff --git a/demos/angular/src/tsconfig.spec.json b/angular/test/nav/src/tsconfig.spec.json
similarity index 100%
rename from demos/angular/src/tsconfig.spec.json
rename to angular/test/nav/src/tsconfig.spec.json
diff --git a/demos/angular/src/typings.d.ts b/angular/test/nav/src/typings.d.ts
similarity index 100%
rename from demos/angular/src/typings.d.ts
rename to angular/test/nav/src/typings.d.ts
diff --git a/demos/angular/testing/router-stubs.ts b/angular/test/nav/testing/router-stubs.ts
similarity index 100%
rename from demos/angular/testing/router-stubs.ts
rename to angular/test/nav/testing/router-stubs.ts
diff --git a/demos/angular/tsconfig.json b/angular/test/nav/tsconfig.json
similarity index 100%
rename from demos/angular/tsconfig.json
rename to angular/test/nav/tsconfig.json
diff --git a/demos/angular/tslint.json b/angular/test/nav/tslint.json
similarity index 100%
rename from demos/angular/tslint.json
rename to angular/test/nav/tslint.json
diff --git a/demos/angular/cpang.sh b/demos/angular/cpang.sh
deleted file mode 100755
index 22502e41e1..0000000000
--- a/demos/angular/cpang.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rm -rf node_modules/\@ionic/angular/dist
-cp -R ../../angular/dist/ node_modules/\@ionic/angular/dist
diff --git a/demos/angular/cpcore.sh b/demos/angular/cpcore.sh
deleted file mode 100755
index f71cb07b40..0000000000
--- a/demos/angular/cpcore.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-rm -rf node_modules/\@ionic/core/dist
-cp -R ../../core/dist/ node_modules/\@ionic/core/dist