diff --git a/INTRODUCTION.md b/INTRODUCTION.md
index c9337f8be5..c6b01b45fe 100644
--- a/INTRODUCTION.md
+++ b/INTRODUCTION.md
@@ -18,22 +18,21 @@ However, there are use-cases that Share does not fit very well, such as:
 This is where this application development framework comes into play, it can be used to create exactly the user interface 
 (i.e. web client) that the requirements demand.  
  
-The framework consists of several components that can be combined to form a customized content management application.
-Here is a list of some of the available web components:
+The framework consists of several libraries that can be used to form a customized content management application. The available libraries are:
 
-- [Core library](ng2-components/ng2-alfresco-core/README.md)
-- [DataTable](ng2-components/ng2-alfresco-datatable/README.md)
-- [DocumentList](ng2-components/ng2-alfresco-documentlist/README.md)
-- [Viewer](ng2-components/ng2-alfresco-viewer/README.md)
-- [Login](ng2-components/ng2-alfresco-login/README.md)
-- [Upload](ng2-components/ng2-alfresco-upload/README.md)
+- [Core](lib/core/README.md)
+- [Content Services](lib/content-services/README.md)
+- [Process Services](lib/process-services/README.md)
+- [Insights](lib/insights/README.md)
 
-You can browse all the components at this [page](http://devproducts.alfresco.com/).
+
+You can browse all the components at the
+[ADF Component Catalog](https://alfresco.github.io/adf-component-catalog/).
 
 An architecture overview looks like this:
 
 <p align="center">
-  <img title="alfresco-ng2-components-architecture" alt='alfresco' src='assets/alfresco-app-dev-framework-architecture.png'></img>
+  <img title="alfresco-angular-components-architecture" alt='alfresco' src='assets/alfresco-app-dev-framework-architecture.png'></img>
 </p>
 
 Here we can also see that there is an Alfresco JavaScript framework in use that wraps the Alfresco REST API, to make things easier for the client developer.
diff --git a/README.md b/README.md
index 06666bf1eb..44269b17b2 100644
--- a/README.md
+++ b/README.md
@@ -30,10 +30,10 @@ necessary configuration, see this [page](PREREQUISITES.md).
 
 ## Components
 
-To view the complete list of all the components that you can use to build your custom Alfresco (ECM,BPM) client follow this link:
-[Components](/ng2-components).
+To view the sources of all components that you can use to build your custom Alfresco (Content Services or Process Services) client follow this link:
+[Components](/lib).
 
-You can browse all the components at the following [page](http://devproducts.alfresco.com/).
+You can browse all the components at the [ADF Component Catalog](https://alfresco.github.io/adf-component-catalog/).
 
 ## Demo Application
 
diff --git a/lib/content-services/README.md b/lib/content-services/README.md
index 29ef704794..45509454cb 100644
--- a/lib/content-services/README.md
+++ b/lib/content-services/README.md
@@ -17,7 +17,7 @@ Contains a variety of components, directives and services used throughout ADF
 
 ## Documentation
 
-See the [ADF Content service](../../docs/README.md#content-services) section of the [docs index](../../docs/README.md)
+See the [ADF Content Services](../../docs/README.md#content-services) section of the [docs index](../../docs/README.md)
 for all available documentation on this library.
 
 ## Prerequisites
diff --git a/lib/insights/README.md b/lib/insights/README.md
index 0ccd059770..ccccd0af8e 100644
--- a/lib/insights/README.md
+++ b/lib/insights/README.md
@@ -17,7 +17,7 @@ Contains a variety of components, directives and services used throughout ADF
 
 ## Documentation
 
-See the [ADF Core](../../docs/README.md#process-services) section of the [docs index](../../docs/README.md)
+See the [ADF Insights](../../docs/README.md#insights) section of the [docs index](../../docs/README.md)
 for all available documentation on this library.
 
 ## Prerequisites
diff --git a/lib/process-services/README.md b/lib/process-services/README.md
index fd7d15241f..3ba1472e31 100644
--- a/lib/process-services/README.md
+++ b/lib/process-services/README.md
@@ -17,7 +17,7 @@ Contains a variety of components, directives and services used throughout ADF
 
 ## Documentation
 
-See the [ADF Core](../../docs/README.md#process-services) section of the [docs index](../../docs/README.md)
+See the [ADF Process Services](../../docs/README.md#process-services) section of the [docs index](../../docs/README.md)
 for all available documentation on this library.
 
 ## Prerequisites