diff --git a/doc/content/apis/modelc/model/index.md b/doc/content/apis/modelc/model/index.md
index 2ce717b..79f550e 100644
--- a/doc/content/apis/modelc/model/index.md
+++ b/doc/content/apis/modelc/model/index.md
@@ -325,7 +325,7 @@ SignalVector (pointer to NULL terminated list)
 #### Example
 
 
-{{< readfile file="examples/model_sv_create.c" code="true" lang="c" >}}
+{{< readfile file="../examples/model_sv_create.c" code="true" lang="c" >}}
 
 
 
diff --git a/doc/content/apis/modelc/schema/index.md b/doc/content/apis/modelc/schema/index.md
index d615bdd..8fbf730 100644
--- a/doc/content/apis/modelc/schema/index.md
+++ b/doc/content/apis/modelc/schema/index.md
@@ -137,7 +137,7 @@ searched in the order they were parsed (i.e. listed order at the CLI).
 #### Example
 
 
-{{< readfile file="examples/schema_object_search.c" code="true" lang="c" >}}
+{{< readfile file="../examples/schema_object_search.c" code="true" lang="c" >}}
 
 #### Parameters
 
diff --git a/doc/content/docs/arch/gateway-deploy.png b/doc/content/docs/arch/gateway/gateway-deploy.png
similarity index 100%
rename from doc/content/docs/arch/gateway-deploy.png
rename to doc/content/docs/arch/gateway/gateway-deploy.png
diff --git a/doc/content/docs/arch/gateway-sequence.png b/doc/content/docs/arch/gateway/gateway-sequence.png
similarity index 100%
rename from doc/content/docs/arch/gateway-sequence.png
rename to doc/content/docs/arch/gateway/gateway-sequence.png
diff --git a/doc/content/docs/arch/gateway.md b/doc/content/docs/arch/gateway/index.md
similarity index 93%
rename from doc/content/docs/arch/gateway.md
rename to doc/content/docs/arch/gateway/index.md
index 757b835..df83b6f 100644
--- a/doc/content/docs/arch/gateway.md
+++ b/doc/content/docs/arch/gateway/index.md
@@ -1,13 +1,13 @@
 ---
-title: "Gateway Model"
-linkTitle: "Gateway Model"
+title: "Gateway Models"
+linkTitle: "Gateway"
 weight: 1040
 tags:
   - ModelC
   - Architecture
 github_repo: "https://github.com/boschglobal/dse.modelc"
-github_subdir: "doc/content/architecture"
-path_base_for_github_subdir: "content/reference/architecture/"
+github_subdir: "doc/content/docs/arch/gateway"
+path_base_for_github_subdir: "content/docs/arch/gateway/"
 ---
 
 ## Synopsis
diff --git a/doc/content/docs/arch/signalvector.md b/doc/content/docs/arch/signalvector/index.md
similarity index 97%
rename from doc/content/docs/arch/signalvector.md
rename to doc/content/docs/arch/signalvector/index.md
index a461ced..eed4319 100644
--- a/doc/content/docs/arch/signalvector.md
+++ b/doc/content/docs/arch/signalvector/index.md
@@ -1,13 +1,13 @@
 ---
 title: "Signal Vectors"
-linkTitle: "Signal Vectors"
+linkTitle: "Signals"
 weight: 1020
 tags:
   - ModelC
   - Architecture
 github_repo: "https://github.com/boschglobal/dse.modelc"
-github_subdir: "doc/content/architecture"
-path_base_for_github_subdir: "content/reference/architecture/"
+github_subdir: "doc/content/docs/arch/signalvector"
+path_base_for_github_subdir: "content/docs/arch/signalvector/"
 ---
 
 ## Synopsis
diff --git a/dse/modelc/model/schema.c b/dse/modelc/model/schema.c
index 2704d87..a760802 100644
--- a/dse/modelc/model/schema.c
+++ b/dse/modelc/model/schema.c
@@ -27,7 +27,7 @@ searched in the order they were parsed (i.e. listed order at the CLI).
 Example
 -------
 
-{{< readfile file="examples/schema_object_search.c" code="true" lang="c" >}}
+{{< readfile file="../examples/schema_object_search.c" code="true" lang="c" >}}
 
 Parameters
 ----------
diff --git a/dse/modelc/model/signal.c b/dse/modelc/model/signal.c
index 78a5679..7ea96a1 100644
--- a/dse/modelc/model/signal.c
+++ b/dse/modelc/model/signal.c
@@ -238,7 +238,7 @@ SignalVector (pointer to NULL terminated list)
 Example
 -------
 
-{{< readfile file="examples/model_sv_create.c" code="true" lang="c" >}}
+{{< readfile file="../examples/model_sv_create.c" code="true" lang="c" >}}
 
 */
 SignalVector* model_sv_create(ModelInstanceSpec* mi)