diff --git a/packages/composer-website/jekylldocs/Hyperledger Composer.xmind b/packages/composer-website/jekylldocs/Hyperledger Composer.xmind
deleted file mode 100644
index 3657765ad3..0000000000
Binary files a/packages/composer-website/jekylldocs/Hyperledger Composer.xmind and /dev/null differ
diff --git a/packages/composer-website/jekylldocs/LICENCE b/packages/composer-website/jekylldocs/LICENCE
deleted file mode 100644
index 00bcb6e373..0000000000
--- a/packages/composer-website/jekylldocs/LICENCE
+++ /dev/null
@@ -1 +0,0 @@
-# test
\ No newline at end of file
diff --git a/packages/composer-website/jekylldocs/_includes/foot.html b/packages/composer-website/jekylldocs/_includes/foot.html
deleted file mode 100644
index 308cfcb72a..0000000000
--- a/packages/composer-website/jekylldocs/_includes/foot.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
-
-
diff --git a/packages/composer-website/jekylldocs/_includes/head.html b/packages/composer-website/jekylldocs/_includes/head.html
index 833e958283..2b818a3c42 100644
--- a/packages/composer-website/jekylldocs/_includes/head.html
+++ b/packages/composer-website/jekylldocs/_includes/head.html
@@ -22,7 +22,7 @@
-
-
+
+
{% endif %}
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md b/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md
new file mode 100644
index 0000000000..513b51fe03
--- /dev/null
+++ b/packages/composer-website/jekylldocs/_includes/sidebars/accordion-toc0.md
@@ -0,0 +1,11 @@
+{% assign sorted = site.pages | sort: 'index-order' %}
+{% for page in sorted %}
+{% if page.index-order %}
+{% capture mods %}{{ page.index-order | modulo:100 }}{% endcapture %}
+{% if mods == "0" %}
+- [{{ page.title }}]({{site.url}}/composer{{page.url}}.html)
+{% elsif mods != "0" %}
+ - [{{page.title}}]({{site.url}}/composer{{page.url}}.html)
+{% endif %}
+{% endif %}
+{% endfor %}
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/applications.md b/packages/composer-website/jekylldocs/_includes/sidebars/applications.md
deleted file mode 100644
index 26d8ce6dd5..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/applications.md
+++ /dev/null
@@ -1,13 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
- - [Node.js applications](../applications/node.html)
- - [Web or mobile applications](../applications/web.html)
- - [Subscribing to events](../applications/subscribing-to-events.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/installing.md b/packages/composer-website/jekylldocs/_includes/sidebars/installing.md
deleted file mode 100644
index 84c7a5b26b..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/installing.md
+++ /dev/null
@@ -1,13 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
- - [Try Online Playground](../installing/getting-started-with-playground.html)
- - [Install Local Playground](../installing/using-playground-locally.html)
- - [Install a Development Environment](../installing/development-tools.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md b/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md
deleted file mode 100644
index 9d8f6132f6..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/integrating.md
+++ /dev/null
@@ -1,15 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
- - [Exposing your business network as a REST API](../integrating/getting-started-rest-api.html)
- - [Enabling REST API authentication for a business network](../integrating/enabling-rest-authentication.html)
- - [Deploying the REST server for a business network](../integrating/deploying-the-rest-server.html)
- - [Calling external REST services](../integrating/call-out.html)
- - [Integrating using Node-RED](../integrating/node-red.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/introduction.md b/packages/composer-website/jekylldocs/_includes/sidebars/introduction.md
deleted file mode 100644
index 48c92330cc..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/introduction.md
+++ /dev/null
@@ -1,12 +0,0 @@
-- [Introduction](../introduction/introduction.html)
- - [Key Concepts](../introduction/key-concepts.html)
- - [Typical Solution Architecture](../introduction/solution-architecture.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/managing.md b/packages/composer-website/jekylldocs/_includes/sidebars/managing.md
deleted file mode 100644
index f7bafc398f..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/managing.md
+++ /dev/null
@@ -1,17 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
- - [Participants and Identities](../managing/participantsandidentities.html)
- - [Adding a participant](../managing/participant-add.html)
- - [Issuing an identity to a participant](../managing/identity-issue.html)
- - [Revoking an identity from a participant](../managing/identity-revoke.html)
- - [Enabling OAuth using GitHub](../managing/github-oauth.html)
- - [Enabling access control using the current participant](../managing/current-participant.html)
- - [Updating {{site.data.conrefs.composer_full}}](../managing/updating-composer.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/problems.md b/packages/composer-website/jekylldocs/_includes/sidebars/problems.md
deleted file mode 100644
index b5392ad6ba..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/problems.md
+++ /dev/null
@@ -1,10 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/reference.md b/packages/composer-website/jekylldocs/_includes/sidebars/reference.md
deleted file mode 100644
index fae7d4e2f0..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/reference.md
+++ /dev/null
@@ -1,20 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
- - [npm Modules](../reference/MeetTheModules.html )
- - [Modeling Language](../reference/cto_language.html )
- - [Access Control Language](../reference/acl_language.html )
- - [Query Language](../reference/query-language.html)
- - [Model Compatibility](../reference/model-compatibility.html)
- - [Connection Profile](../reference/connectionprofile.html )
- - [Transaction Processor Functions](../reference/js_scripts.html )
- - [CLI Commands](../reference/commands.html )
- - [API Documentation](../jsdoc/index.html )
- - [Glossary](../reference/glossary.html )
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/support.md b/packages/composer-website/jekylldocs/_includes/sidebars/support.md
deleted file mode 100644
index 4f1ecdc147..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/support.md
+++ /dev/null
@@ -1,11 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
- - [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md b/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md
deleted file mode 100644
index 6c815ccde5..0000000000
--- a/packages/composer-website/jekylldocs/_includes/sidebars/tutorials.md
+++ /dev/null
@@ -1,12 +0,0 @@
-- [Introduction](../introduction/introduction.html)
-- [Installing](../installing/installing-index.html)
-- [Tutorials](../tutorials/tutorials.html)
- - [Playground Tutorial](../tutorials/playground-guide.html)
- - [Developer Tutorial](../tutorials/developer-guide.html)
-- [Developing Business Networks](../business-network/business-network-index.html)
-- [Developing Applications](../applications/applications-index.html)
-- [Integrating Existing Systems](../integrating/integrating-index.html)
-- [Managing and Operating](../managing/managingindex.html)
-- [Diagnosing Problems](../problems/diagnostics.html)
-- [Reference](../reference/reference-index.html)
-- [Support](../support/index.html)
diff --git a/packages/composer-website/jekylldocs/_layouts/base.html b/packages/composer-website/jekylldocs/_layouts/base.html
index 98b69a7dc1..8e410d6a3c 100644
--- a/packages/composer-website/jekylldocs/_layouts/base.html
+++ b/packages/composer-website/jekylldocs/_layouts/base.html
@@ -23,7 +23,4 @@