diff --git a/README.md b/README.md
index 558a2fe5b..2cb8faf57 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,7 @@ Developers
 Demos 
 
 *  [Explore Online](https://tburleson-layouts-demos.firebaseapp.com/)
-*  [Source Code](https://github.com/angular/flex-layout/blob/master/src/demo-app/demo-app-module.ts)
+*  [Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/app.module.ts)
 
 * StackBlitz Templates
 
diff --git a/docs/documentation/Adaptive-Layouts.md b/docs/documentation/Adaptive-Layouts.md
index e450f5993..c87aede9d 100644
--- a/docs/documentation/Adaptive-Layouts.md
+++ b/docs/documentation/Adaptive-Layouts.md
@@ -22,7 +22,7 @@ Developers can use the following directives to achieve some Adaptive UX goals:
 For examples of `fxHide` usages in Adaptive layouts, please review the demo **Show & Hide Directives**:
 
 * [Demo](https://tburleson-layouts-demos.firebaseapp.com/#/responsive)
-* [Source](https://github.com/angular/flex-layout/blob/master/src/demo-app/app/docs-layout-responsive/responsiveShowHide.demo.ts#L15) 
+* [Source](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/responsive/responsive-show-hide/responsive-show-hide.component.ts#L15) 
 
 ---- 
 
diff --git a/docs/documentation/Use-Cases.md b/docs/documentation/Use-Cases.md
index 2ea8e3a44..f67330f42 100644
--- a/docs/documentation/Use-Cases.md
+++ b/docs/documentation/Use-Cases.md
@@ -35,4 +35,4 @@ or used as fallback
   * Custom set of breakpoints can be defined as a Provider
   * Custom breakpoints will override ALL default breakpoints (no merging)
  
-[Demo]: https://github.com/angular/flex-layout/blob/master/src/demo-app/app/docs-layout-responsive/responsiveFlexOrder.demo.ts#L59
\ No newline at end of file
+[Demo]: https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/responsive/responsive-flex-order/responsive-flex-order.component.ts#L59
\ No newline at end of file
diff --git a/docs/documentation/Using-Angular-CLI.md b/docs/documentation/Using-Angular-CLI.md
index 405b2fc95..4b3eb7601 100644
--- a/docs/documentation/Using-Angular-CLI.md
+++ b/docs/documentation/Using-Angular-CLI.md
@@ -71,4 +71,4 @@ System.config({
 Developers are encouraged to review the live demos and source for the Flex-Layout Demos:
 
 * [Live Demos](https://tburleson-layouts-demos.firebaseapp.com/)
-* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/src/demo-app/)
+* [Demo Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/)
diff --git a/docs/documentation/_Sidebar.md b/docs/documentation/_Sidebar.md
index e08d4522d..cc5d1c96c 100644
--- a/docs/documentation/_Sidebar.md
+++ b/docs/documentation/_Sidebar.md
@@ -12,7 +12,7 @@
   * [Best Performance](https://github.com/angular/flex-layout/wiki/Best-Performance)
 * Demos 
   * [Live Online](https://tburleson-layouts-demos.firebaseapp.com/)
-  * [Source Code](https://github.com/angular/flex-layout/blob/master/src/demo-app/demo-app-module.ts#L28)
+  * [Source Code](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/app.module.ts#L28)
 
 * StackBlitz Templates
   * [Flex-Layout Template](https://stackblitz.com/edit/angular-flex-layout-seed)
diff --git a/docs/documentation/fxFlex-API.md b/docs/documentation/fxFlex-API.md
index ca55c9814..5f9a11c0c 100644
--- a/docs/documentation/fxFlex-API.md
+++ b/docs/documentation/fxFlex-API.md
@@ -14,7 +14,7 @@ available. The flex-grow value overrides the width.
 * **flex-shrink**: defines how much a flexbox item should **shrink** if there is **not enough** space available.
 * **flex-basis**: controls the default size of an element, before it is manipulated by other Flexbox properties
 
-[![fxFlex example](https://cloud.githubusercontent.com/assets/210413/21274996/6b640f8a-c390-11e6-87ac-ca85eb6c3983.png)](https://github.com/angular/flex-layout/blob/master/src/demo-app/app/stack-overflow/columnSpan.demo.ts#L23)
+[![fxFlex example](https://cloud.githubusercontent.com/assets/210413/21274996/6b640f8a-c390-11e6-87ac-ca85eb6c3983.png)](https://github.com/angular/flex-layout/blob/master/src/apps/demo-app/src/app/stack-overflow/grid-column-span/grid-column-span.component.ts#L23)
 
 Note that the resizing occurs along the main-axis of the layout and maybe affected by the **fxLayoutAlign** options. 
 
@@ -182,5 +182,5 @@ Developer's seeking details on FlexBox should
 * Review [CSS-Tricks - A Guide to FlexBox](https://css-tricks.com/snippets/css/a-guide-to-flexbox/), or 
 * Play with the online [Flex-Layout Demos](https://tburleson-layouts-demos.firebaseapp.com/#/docs)
 
-[fxFlex]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex.ts
-[FlexDirective]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex.ts#L65-L67
+[fxFlex]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex/flex.ts
+[FlexDirective]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex/flex.ts#L65-L67
diff --git a/docs/documentation/fxFlexAlign-API.md b/docs/documentation/fxFlexAlign-API.md
index 6e394d4af..2398ca271 100644
--- a/docs/documentation/fxFlexAlign-API.md
+++ b/docs/documentation/fxFlexAlign-API.md
@@ -28,4 +28,4 @@ container
 supported by this directive
 
 
-[Align]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex-align.ts#L38
\ No newline at end of file
+[Align]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex-align/flex-align.ts#L38
\ No newline at end of file
diff --git a/docs/documentation/fxFlexFill-API.md b/docs/documentation/fxFlexFill-API.md
index be5caed20..8d7201aad 100644
--- a/docs/documentation/fxFlexFill-API.md
+++ b/docs/documentation/fxFlexFill-API.md
@@ -20,4 +20,4 @@ element whose width and height should be maximized
 | `min-width` | `100%` |
 | `min-height`| `100%` |
 
-[Fill]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex-fill.tst#L31
\ No newline at end of file
+[Fill]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex-fill/flex-fill.tst#L31
\ No newline at end of file
diff --git a/docs/documentation/fxFlexOffset-API.md b/docs/documentation/fxFlexOffset-API.md
index 8e990d160..de78a3839 100644
--- a/docs/documentation/fxFlexOffset-API.md
+++ b/docs/documentation/fxFlexOffset-API.md
@@ -26,4 +26,4 @@ styling
 > RTL support is coming soon, which will automatically apply `margin-right` instead of `margin-left`
 
 
-[Offset]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex-offset.ts#L41
\ No newline at end of file
+[Offset]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex-offset/flex-offset.ts#L41
\ No newline at end of file
diff --git a/docs/documentation/fxFlexOrder-API.md b/docs/documentation/fxFlexOrder-API.md
index 88475e3f9..75b4391ab 100644
--- a/docs/documentation/fxFlexOrder-API.md
+++ b/docs/documentation/fxFlexOrder-API.md
@@ -20,4 +20,4 @@ the positional ordering of the element
 |  `(default)` | `order: 0`     |
 |  `<int>`     | `order: <int>` |
 
-[Order]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/flex-order.ts#41
\ No newline at end of file
+[Order]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/flex-order/flex-order.ts#41
\ No newline at end of file
diff --git a/docs/documentation/fxLayout-API.md b/docs/documentation/fxLayout-API.md
index 6936eac6c..eed0bbede 100644
--- a/docs/documentation/fxLayout-API.md
+++ b/docs/documentation/fxLayout-API.md
@@ -42,4 +42,4 @@ Changes to the fxLayout value will cause the following directives to update and
 * **fxFlex**
 * **fxLayoutAlign**
 
-[Layout]: https://github.com/angular/flex-layout/blob/master/src/lib/api/flexbox/layout.ts#L34-L40
\ No newline at end of file
+[Layout]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/layout/layout.ts#L34-L40
\ No newline at end of file
diff --git a/docs/documentation/fxLayoutAlign-API.md b/docs/documentation/fxLayoutAlign-API.md
index bde78475e..a865107ec 100644
--- a/docs/documentation/fxLayoutAlign-API.md
+++ b/docs/documentation/fxLayoutAlign-API.md
@@ -39,4 +39,4 @@ container
 |  `stretch`       | `max-width: 100% if flex-direction: column; else max-height: 100%` |
 
 
-[Layout]: https://github.com/angular/flex-layout/blob/master/src/lib/flexbox/api/layout-align.ts#L47
\ No newline at end of file
+[Layout]: https://github.com/angular/flex-layout/blob/master/src/lib/flex/layout-align/layout-align.ts#L47
\ No newline at end of file
diff --git a/docs/documentation/fxLayoutGap-API.md b/docs/documentation/fxLayoutGap-API.md
index 82679ffa4..86565fd0c 100644
--- a/docs/documentation/fxLayoutGap-API.md
+++ b/docs/documentation/fxLayoutGap-API.md
@@ -1,4 +1,4 @@
-The [**fxLayoutGap** directive](https://github.com/angular/flex-layout/blob/master/src/lib/api/flexbox/layout-gap.tst#L38) 
+The [**fxLayoutGap** directive](https://github.com/angular/flex-layout/blob/master/src/lib/flex/layout-gap/layout-gap.tst#L38) 
 should be used on to specify margin gaps on children within a flexbox container (e.g. nested within a fxLayout container).
 
 * `margin-right` used when the parent container `flex-direction` == "row" 
diff --git a/docs/documentation/imgSrc-API.md b/docs/documentation/imgSrc-API.md
index 6df3d5453..8fd25bf4e 100644
--- a/docs/documentation/imgSrc-API.md
+++ b/docs/documentation/imgSrc-API.md
@@ -14,4 +14,4 @@ The [**imgSrc** directive][imgSrc] is a responsive extension of the HTML <img> `
 The initial value will be used as the default and fallback when a responsive alias is not defined
 
 
-[imgSrc]: https://github.com/angular/flex-layout/blob/master/src/lib/api/ext/img-src.ts#L38
\ No newline at end of file
+[imgSrc]: https://github.com/angular/flex-layout/blob/master/src/lib/extended/img-src/img-src.ts#L38
\ No newline at end of file
diff --git a/docs/documentation/ngClass-API.md b/docs/documentation/ngClass-API.md
index e5c8d19a3..6af5612cc 100644
--- a/docs/documentation/ngClass-API.md
+++ b/docs/documentation/ngClass-API.md
@@ -86,5 +86,5 @@ removed;
 </some-element>
 ```
 
-[ngClass]: https://github.com/angular/flex-layout/blob/master/src/lib/api/ext/class.ts
+[ngClass]: https://github.com/angular/flex-layout/blob/master/src/lib/extended/class/class.ts
 [aioNgClass]: https://github.com/angular/angular/blob/master/packages/common/src/directives/ng_class.ts#L40
\ No newline at end of file
diff --git a/docs/documentation/ngStyle-API.md b/docs/documentation/ngStyle-API.md
index c1c3f0e2b..5a5f940d4 100644
--- a/docs/documentation/ngStyle-API.md
+++ b/docs/documentation/ngStyle-API.md
@@ -83,5 +83,5 @@ the default styles being re-applied.
 
 ![sample1](https://user-images.githubusercontent.com/210413/30512495-e974c33a-9ab6-11e7-8dec-9805219baaac.jpg)
 
-[ngStyle]: https://github.com/angular/flex-layout/blob/master/src/lib/api/ext/style.ts#L54
+[ngStyle]: https://github.com/angular/flex-layout/blob/master/src/lib/extended/style/style.ts#L54
 [aioNgStyle]: https://github.com/angular/angular/blob/master/packages/common/src/directives/ng_style.ts#L34
\ No newline at end of file