diff --git a/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc b/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc
new file mode 100644
index 0000000..fad0494
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-configuration-matrix.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/configuration-matrix.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-introduction.adoc b/src/site/asciidoc/apex-intro/intro-introduction.adoc
new file mode 100644
index 0000000..95219bb
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-introduction.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/introduction.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc b/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc
new file mode 100644
index 0000000..1e8510f
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-policy-matrix.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/policy-matrix.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-resources.adoc b/src/site/asciidoc/apex-intro/intro-resources.adoc
new file mode 100644
index 0000000..37405a3
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-resources.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/resources.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc b/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc
new file mode 100644
index 0000000..c239cdf
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-upee-clustering.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/upee-clustering.adoc[]
diff --git a/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc b/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc
new file mode 100644
index 0000000..c3abf48
--- /dev/null
+++ b/src/site/asciidoc/apex-intro/intro-upee-deployment.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/upee-deployment.adoc[]
diff --git a/src/site/asciidoc/apex-publications.adoc b/src/site/asciidoc/apex-publications.adoc
new file mode 100644
index 0000000..dbf5ce8
--- /dev/null
+++ b/src/site/asciidoc/apex-publications.adoc
@@ -0,0 +1,45 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+== APEX Publications
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/apex.adoc[]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/cnsm-2015.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2016.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2017a.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2017b.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018a.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018c.adoc[leveloffset=+1]
+
+
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/policy-general.adoc[]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/monami-2012.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/im-2013.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/monami-2013.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/cnsm-2014.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/5g-2015.adoc[leveloffset=+1]
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/reference-publications/noms-2018b.adoc[leveloffset=+1]
+
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc b/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc
new file mode 100644
index 0000000..9fb2741
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-checkstyle.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc b/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc
new file mode 100644
index 0000000..0a5b3f4
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-documentation.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/documentation.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-site.adoc b/src/site/asciidoc/developer-guide/build/dg-build-site.adoc
new file mode 100644
index 0000000..727811c
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-site.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/site.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc b/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc
new file mode 100644
index 0000000..1d08e71
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-standard.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/standard.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc
new file mode 100644
index 0000000..57ec221
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-with-all-components.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-all-components.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc
new file mode 100644
index 0000000..1bab557
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-with-all-tests.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-all-tests.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc b/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc
new file mode 100644
index 0000000..3f11e99
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build-with-tests.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/with-tests.adoc[]
diff --git a/src/site/asciidoc/developer-guide/build/dg-build.adoc b/src/site/asciidoc/developer-guide/build/dg-build.adoc
new file mode 100644
index 0000000..fcc48e9
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/build/dg-build.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-build/introduction.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc
new file mode 100644
index 0000000..85ee110
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-02-rules.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/02-rules.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc
new file mode 100644
index 0000000..2c4f691
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-10-plugin-jautodoc.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/10-plugin-jautodoc.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc
new file mode 100644
index 0000000..2cafd21
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-11-plugin-checkstyle.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/11-plugin-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc
new file mode 100644
index 0000000..c6ec70a
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-20-configure-eclipse-templates.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/20-configure-eclipse-templates.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc
new file mode 100644
index 0000000..b829d0d
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-21-configure-jautodoc-templates.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/21-configure-jautodoc-templates.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc
new file mode 100644
index 0000000..52dbd2f
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-30-configure-checkstyle-maven.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/30-configure-checkstyle-maven.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc
new file mode 100644
index 0000000..0ed5772
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-31-run-checkstyle-maven.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/31-run-checkstyle-maven.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc
new file mode 100644
index 0000000..86cf187
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-32-configure-checkstyle-eclipse.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/32-configure-checkstyle-eclipse.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc
new file mode 100644
index 0000000..b849963
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-33-configure-checkstyle-blueprint.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/33-configure-checkstyle-blueprint.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc
new file mode 100644
index 0000000..5bb23b0
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-40-use-eclipse-source-operations.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/40-use-eclipse-source-operations.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc
new file mode 100644
index 0000000..1ad1e69
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-41-using-jautodoc.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/41-using-jautodoc.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc
new file mode 100644
index 0000000..a22ab99
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-42-using-checkstyle.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/42-using-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc
new file mode 100644
index 0000000..5320969
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-50-disable-eclispe-formatting.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/50-disable-eclispe-formatting.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc
new file mode 100644
index 0000000..ec1f1ce
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle-51-supress-checkstyle.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/51-supress-checkstyle.adoc[]
diff --git a/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc
new file mode 100644
index 0000000..eb0d982
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/codestyle/dg-codestyle.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-codestyle/01-introduction.adoc[]
diff --git a/src/site/asciidoc/developer-guide/dg-code-examples.adoc b/src/site/asciidoc/developer-guide/dg-code-examples.adoc
new file mode 100644
index 0000000..b14fe02
--- /dev/null
+++ b/src/site/asciidoc/developer-guide/dg-code-examples.adoc
@@ -0,0 +1,18 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+== Code Examples
+
+- APEX Applications (apex-apps)
+  ** Utilities: link:../modules/tools/tools-common/example-cli.html[CLI Options and Parser Example]
+  ** Utilities: link:../modules/tools/tools-common/example-cli-version.html[Autoversion for Applications Example]
diff --git a/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc b/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc
new file mode 100644
index 0000000..c2053e1
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/pg-logic-cheatsheet.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/logic-cheatsheet.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-policy-examples.adoc b/src/site/asciidoc/policy-guide/pg-policy-examples.adoc
new file mode 100644
index 0000000..ec357b2
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/pg-policy-examples.adoc
@@ -0,0 +1,16 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+== Policy Examples
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/policy-examples.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc b/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc
new file mode 100644
index 0000000..1e8510f
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/pg-policy-matrix.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-intro/policy-matrix.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-task-logic.adoc b/src/site/asciidoc/policy-guide/pg-task-logic.adoc
new file mode 100644
index 0000000..46c568c
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/pg-task-logic.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/task-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc b/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc
new file mode 100644
index 0000000..582229a
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/pg-task-selection-logic.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-write-logic/task-selection-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc
new file mode 100644
index 0000000..56a84ec
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitem.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextitem.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc
new file mode 100644
index 0000000..9b010fb
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextitemtemplate.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextitemtemplate.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc
new file mode 100644
index 0000000..656cb63
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-contextmap.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-contextmap.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc
new file mode 100644
index 0000000..b687a72
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-datatype.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-datatype.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc
new file mode 100644
index 0000000..0cb2cf8
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-event.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-event.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc
new file mode 100644
index 0000000..76ffc11
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-eventfield.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-eventfield.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc
new file mode 100644
index 0000000..d964148
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-logic.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-logic.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc
new file mode 100644
index 0000000..a10a361
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policy.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-policy.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc
new file mode 100644
index 0000000..762daa7
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-policymodel.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-policymodel.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc
new file mode 100644
index 0000000..79fd717
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-state.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-state.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc
new file mode 100644
index 0000000..54f1d4b
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-task.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-task.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc
new file mode 100644
index 0000000..982e5c3
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concept-taskparameter.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concept-taskparameter.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc
new file mode 100644
index 0000000..024fca6
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-concepts-keys.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/concepts-keys.adoc[]
diff --git a/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc b/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc
new file mode 100644
index 0000000..f4016f2
--- /dev/null
+++ b/src/site/asciidoc/policy-guide/policy-model/apm-introduction.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/apex-policy-model/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc b/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc
new file mode 100644
index 0000000..6c8b9a5
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-00-introduction.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-config/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc b/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc
new file mode 100644
index 0000000..4401f4c
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-01-config-general-format.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-general-format.adoc[]
diff --git a/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc b/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc
new file mode 100644
index 0000000..b12c84a
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-02-config-service-parameters.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-service-parameters.adoc[]
\ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc b/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc
new file mode 100644
index 0000000..d82894d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-03-config-interfaces-general.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-interfaces-general.adoc[]
\ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc b/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc
new file mode 100644
index 0000000..82e3474
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-04-executors.adoc
@@ -0,0 +1,24 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-plugins-executor-dir}/site-docs/adoc/fragments/executors.adoc[]
+
+include::{adsite-plugins-executor-javascript-dir}/site-docs/adoc/fragments/javascript-config.adoc[leveloffset=+1]
+
+include::{adsite-plugins-executor-jython-dir}/site-docs/adoc/fragments/jython-config.adoc[leveloffset=+1]
+
+include::{adsite-plugins-executor-jruby-dir}/site-docs/adoc/fragments/jruby-config.adoc[leveloffset=+1]
+
+include::{adsite-plugins-executor-java-dir}/site-docs/adoc/fragments/java-config.adoc[leveloffset=+1]
+
+include::{adsite-plugins-executor-mvel-dir}/site-docs/adoc/fragments/mvel-config.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-05-context.adoc b/src/site/asciidoc/user-manual/configuration/um-05-context.adoc
new file mode 100644
index 0000000..099639d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-05-context.adoc
@@ -0,0 +1,16 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-plugins-context-dir}/site-docs/adoc/fragments/context.adoc[]
+
+include::{adsite-plugins-context-schema-avro-dir}/site-docs/adoc/fragments/ctx-schema-avro-config.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc b/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc
new file mode 100644
index 0000000..316d88d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-06-carriertech.adoc
@@ -0,0 +1,32 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/carriertech.adoc[]
+
+include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-standard-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-file-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-dir}/site-docs/adoc/fragments/ct-eventrequestor-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-kafka-dir}/site-docs/adoc/fragments/ct-kafka-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-jms-dir}/site-docs/adoc/fragments/ct-jms-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ct-websocket-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-restclient-dir}/site-docs/adoc/fragments/ct-restclient-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-restserver-dir}/site-docs/adoc/fragments/ct-restserver-io.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-carrier-restrequestor-dir}/site-docs/adoc/fragments/ct-restrequestor-io.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc b/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc
new file mode 100644
index 0000000..cdb0df8
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-07-eventprotols.adoc
@@ -0,0 +1,24 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/event-protocols.adoc[]
+
+include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/ep-json.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-protocol-dir}/site-docs/adoc/fragments/ep-apex.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-protocol-jms-dir}/site-docs/adoc/fragments/ep-jms.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-protocol-yaml-dir}/site-docs/adoc/fragments/ep-yaml.adoc[leveloffset=+1]
+
+include::{adsite-plugins-event-protocol-xml-dir}/site-docs/adoc/fragments/ep-xml.adoc[leveloffset=+1]
diff --git a/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc b/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc
new file mode 100644
index 0000000..d429d2f
--- /dev/null
+++ b/src/site/asciidoc/user-manual/configuration/um-99-config-example.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-services-engine-dir}/site-docs/adoc/fragments/config-example.adoc[]
\ No newline at end of file
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc
new file mode 100644
index 0000000..92fd5e7
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-model-2-cli.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-model-2-cli.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc
new file mode 100644
index 0000000..4d25f91
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-tpl-event-json.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-tpl-event-json.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc
new file mode 100644
index 0000000..87c8e1a
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-app-ws.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/app-ws.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc
new file mode 100644
index 0000000..6211e52
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-application-launcher.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/application-launcher.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc
new file mode 100644
index 0000000..c5cfbcc
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-cli-editor.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/cli-editor.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc
new file mode 100644
index 0000000..1b1a51e
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-deployment.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/eng-deployment.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc
new file mode 100644
index 0000000..20482b9
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-eng-monitoring.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/eng-monitoring.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc
new file mode 100644
index 0000000..25e92d8
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-engine.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/engine.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc
new file mode 100644
index 0000000..a192c9c
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-full-client.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/full-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc
new file mode 100644
index 0000000..c9534c5
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps-rest-editor.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/rest-editor.adoc[]
diff --git a/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc b/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc
new file mode 100644
index 0000000..96865c5
--- /dev/null
+++ b/src/site/asciidoc/user-manual/engine-apps/um-engapps.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-apex/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc b/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc
new file mode 100644
index 0000000..e69caf5
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-build-apex.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/build-apex.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-configure.adoc b/src/site/asciidoc/user-manual/install/um-install-configure.adoc
new file mode 100644
index 0000000..fa5a6df
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-configure.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/configure.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-docker.adoc b/src/site/asciidoc/user-manual/install/um-install-docker.adoc
new file mode 100644
index 0000000..7552fdd
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-docker.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/docker.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-get-source.adoc b/src/site/asciidoc/user-manual/install/um-install-get-source.adoc
new file mode 100644
index 0000000..c53f3ee
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-get-source.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/get-source.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-install.adoc b/src/site/asciidoc/user-manual/install/um-install-install.adoc
new file mode 100644
index 0000000..f3fff1d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-install.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-layout.adoc b/src/site/asciidoc/user-manual/install/um-install-layout.adoc
new file mode 100644
index 0000000..2f473ed
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-layout.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/layout.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc b/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc
new file mode 100644
index 0000000..79889ec
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-monitoring.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-monitoring.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc b/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc
new file mode 100644
index 0000000..1d2741a
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-resteditor.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/install-resteditor.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install-verify.adoc b/src/site/asciidoc/user-manual/install/um-install-verify.adoc
new file mode 100644
index 0000000..0f6e802
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install-verify.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/verify.adoc[]
diff --git a/src/site/asciidoc/user-manual/install/um-install.adoc b/src/site/asciidoc/user-manual/install/um-install.adoc
new file mode 100644
index 0000000..b70434d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/install/um-install.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/install-guide/requirements.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc b/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc
new file mode 100644
index 0000000..340e843
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-example-logic.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/example-logic.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc b/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc
new file mode 100644
index 0000000..2b732c0
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-example-server.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/example-server.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc
new file mode 100644
index 0000000..b00e883
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-logback-status.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logback-status.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc
new file mode 100644
index 0000000..fd49e24
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-logging-3pps.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logging-3pps.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc b/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc
new file mode 100644
index 0000000..ca2ab11
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-logging-policy-logic.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/logging-policy-logic.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc b/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc
new file mode 100644
index 0000000..2166119
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-rolling-file-appenders.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/rolling-file-appenders.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc b/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc
new file mode 100644
index 0000000..2ec3b28
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging-standard-configuration.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/standard-configuration.adoc[]
diff --git a/src/site/asciidoc/user-manual/logging/um-logging.adoc b/src/site/asciidoc/user-manual/logging/um-logging.adoc
new file mode 100644
index 0000000..c4a8100
--- /dev/null
+++ b/src/site/asciidoc/user-manual/logging/um-logging.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-logging/introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc
new file mode 100644
index 0000000..83fe340
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-01-introduction.adoc
@@ -0,0 +1,16 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+= HowTo: My First Policy
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/01-introduction.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc
new file mode 100644
index 0000000..dca728d
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-02-data-models.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/02-data-models.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc
new file mode 100644
index 0000000..2bf3aa4
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-03-policy-step1.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/03-policy-step1.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc
new file mode 100644
index 0000000..c3f05c5
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-031-s1-new-model.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/031-s1-new-model.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc
new file mode 100644
index 0000000..044c21e
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-032-s1-new-events.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/032-s1-new-events.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc
new file mode 100644
index 0000000..d7d279b
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-033-s1-new-policy.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/033-s1-new-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc
new file mode 100644
index 0000000..43a026a
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-034-s1-test-policy.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/034-s1-test-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc
new file mode 100644
index 0000000..2c30630
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-035-s1-clieditor.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/035-s1-clieditor.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc
new file mode 100644
index 0000000..155c888
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-04-policy-step2.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/04-policy-step2.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc
new file mode 100644
index 0000000..d2b4a99
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-041-s2-extend-model.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/041-s2-extend-model.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc
new file mode 100644
index 0000000..454fee8
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-042-s2-test-policy.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/042-s2-test-policy.adoc[]
diff --git a/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc
new file mode 100644
index 0000000..ca39675
--- /dev/null
+++ b/src/site/asciidoc/user-manual/my-first-policy/um-mfp-043-s2-clieditor.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-examples-myfirstpolicy-dir}/site-docs/adoc/fragments/043-s2-clieditor.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc
new file mode 100644
index 0000000..20bb791
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-00.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-00.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc
new file mode 100644
index 0000000..9718776
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-01-vpn-wsconfig.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-01-vpn-wsconfig.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc
new file mode 100644
index 0000000..ea62502
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-02-start-engine.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-02-start-engine.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc
new file mode 100644
index 0000000..e55c437
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-03-start-echo-client.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-03-start-echo-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc
new file mode 100644
index 0000000..fe0c2dd
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-04-start-console-client.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-04-start-console-client.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc
new file mode 100644
index 0000000..c2d541e
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-demo-05-send-events.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-main-dir}/site-docs/adoc/fragments/howto-websockets/demo-05-send-events.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc
new file mode 100644
index 0000000..bfa111b
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-engine-config.adoc
@@ -0,0 +1,14 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/engine-config-bcp.adoc[]
diff --git a/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc b/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc
new file mode 100644
index 0000000..d230c51
--- /dev/null
+++ b/src/site/asciidoc/user-manual/websockets/um-websocket-introduction.adoc
@@ -0,0 +1,21 @@
+//
+// ============LICENSE_START=======================================================
+//  Copyright (C) 2016-2018 Ericsson. All rights reserved.
+// ================================================================================
+// This file is licensed under the CREATIVE COMMONS ATTRIBUTION 4.0 INTERNATIONAL LICENSE
+// Full license text at https://creativecommons.org/licenses/by/4.0/legalcode
+// 
+// SPDX-License-Identifier: CC-BY-4.0
+// ============LICENSE_END=========================================================
+//
+// @author Sven van der Meer (sven.van.der.meer@ericsson.com)
+//
+
+= HowTo: Building an APEX System with Websockets
+
+include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-intro.adoc[]
+
+include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-java.adoc[]
+
+include::{adsite-plugins-event-carrier-websocket-dir}/site-docs/adoc/fragments/ws-foss.adoc[]
+