diff --git a/likec4/workflow.c4 b/likec4/code/workflow.c4
similarity index 98%
rename from likec4/workflow.c4
rename to likec4/code/workflow.c4
index 2582c57..cf7b906 100644
--- a/likec4/workflow.c4
+++ b/likec4/code/workflow.c4
@@ -1,5 +1,5 @@
 model {
-    workflow edfbuilder "EDFbuilder" {
+    workflow edfbuilder_workflow "EDFbuilder" {
         step runEDP "Run edpbuilder script" {
             style {
                 opacity 25%
@@ -88,7 +88,6 @@ model {
             installArgoCDStacks -> cleanup
         }
 
-        runEDP -> createCrossplaneNS
         createCrossplaneNS -> installCrossplaneHelm
         installCrossplaneHelm -> installCrossplaneFunctionsAndProviders
         installCrossplaneFunctionsAndProviders -> waitForCrossplaneFunctionsAndProviders
@@ -108,4 +107,5 @@ views {
         description 'Describes the process how to create an EDP instance'
         include edfbuilder.**
         autoLayout LeftRight 120 110
+    }
 }
\ No newline at end of file
diff --git a/likec4/containers/edp-views.c4 b/likec4/containers/edp-views.c4
new file mode 100644
index 0000000..ad48823
--- /dev/null
+++ b/likec4/containers/edp-views.c4
@@ -0,0 +1,75 @@
+views {
+
+  view keycloak of edp.keycloak {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view forgejo of edp.forgejo {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view crossplane of edp.crossplane {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view externalSecrets of edp.externalSecrets {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view velero of edp.velero {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view minio of edp.minio {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view monitoring of edp.monitoring {
+    include 
+      *,
+      edp.ingressNginx ->
+      loki.*
+  }
+
+  view ingressNginx of edp.ingressNginx {
+    include *
+  }
+
+  view testapp of edp.testApp {
+      include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view mailhog of edp.mailhog {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view spark of edp.spark {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+
+  view argoCD of edp.argoCD {
+    include 
+      *,
+      edp.ingressNginx ->
+  }
+}
+
+
diff --git a/likec4/model.c4 b/likec4/containers/edp.c4
similarity index 81%
rename from likec4/model.c4
rename to likec4/containers/edp.c4
index 18ce459..fa37086 100644
--- a/likec4/model.c4
+++ b/likec4/containers/edp.c4
@@ -1,8 +1,4 @@
 model {
-  developer = actor 'Developer' {
-    description 'The regular user of the platform'
-  }
-
   edp = system 'EDP' {
 
     container ui 'Backstage' {
@@ -226,97 +222,6 @@ model {
   developer -> forgejo 'manages code'
   developer -> keycloak 'authenticates'
   developer -> argoCD 'manages deployments'
+  developer -> edp 'outer loop development'
 }
 
-views {
-
-  view overview {
-    title 'Landscape view'
-
-    include *
-  }
-
-  view edp of edp {
-    title 'Context view'
-    include *
-    exclude ingressNginx ->
-    exclude element.tag = #internal
-
-    style * {
-      opacity 25%
-    }
-  }
-
-  view keycloak of keycloak {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view forgejo of forgejo {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view crossplane of crossplane {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view externalSecrets of externalSecrets {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view velero of velero {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view minio of minio {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view monitoring of monitoring {
-    include 
-      *,
-      ingressNginx ->,
-      loki.*
-  }
-
-  view ingressNginx of ingressNginx {
-    include *
-  }
-
-  view testapp of testApp {
-      include 
-      *,
-      ingressNginx ->
-  }
-
-  view mailhog of mailhog {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view spark of spark {
-    include 
-      *,
-      ingressNginx ->
-  }
-
-  view argoCD of argoCD {
-    include 
-      *,
-      ingressNginx ->
-  }
-}
-
-
diff --git a/likec4/context/actors.c4 b/likec4/context/actors.c4
new file mode 100644
index 0000000..6409c13
--- /dev/null
+++ b/likec4/context/actors.c4
@@ -0,0 +1,5 @@
+model {
+  developer = actor 'Developer' {
+    description 'The regular user of the platform'
+  }
+}
\ No newline at end of file
diff --git a/likec4/context/context-view.c4 b/likec4/context/context-view.c4
new file mode 100644
index 0000000..8d789e9
--- /dev/null
+++ b/likec4/context/context-view.c4
@@ -0,0 +1,20 @@
+views {
+
+  view overview {
+    title 'Landscape view'
+
+    include *
+    exclude element.kind = workflow
+  }
+
+  view edp of edp {
+    title 'Context view'
+    include *
+    exclude ingressNginx ->
+    exclude element.tag = #internal
+
+    style * {
+      opacity 25%
+    }
+  }
+}
\ No newline at end of file
diff --git a/likec4/deployment.c4 b/likec4/deployment/deployment.c4
similarity index 100%
rename from likec4/deployment.c4
rename to likec4/deployment/deployment.c4