Rename folder Model to Elements

src/C4Sharp/Models/Component.cs → src/C4Sharp/Elements/Component.cs

@@ -1,6 +1,6 @@
-using C4Sharp.Extensions;
+using C4Sharp.Commons.Extensions;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// The word "component" is a hugely overloaded term in the software development industry, but in this context a

src/C4Sharp/Models/ComponentType.cs → src/C4Sharp/Elements/ComponentType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// Component types

src/C4Sharp/Models/Container.cs → src/C4Sharp/Elements/Container.cs

@@ -1,7 +1,6 @@
-using System.ComponentModel;
-using C4Sharp.Extensions;
+using C4Sharp.Commons.Extensions;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// Not Docker! In the C4 model, a container represents an application or a data store. A container is something

src/C4Sharp/Models/ContainerBoundary.cs → src/C4Sharp/Elements/ContainerBoundary.cs

@@ -1,7 +1,7 @@
-using C4Sharp.Extensions;
-using C4Sharp.Models.Relationships;
+using C4Sharp.Commons.Extensions;
+using C4Sharp.Elements.Relationships;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// Container Boundary
@@ -29,12 +29,9 @@ public sealed record ContainerBoundary<T> : ContainerBoundary
 {
     public ContainerBoundary():base(StructureIdentity.New<T>(), typeof(T).ToNamingConvention())
     {
-
     }
 
     public ContainerBoundary(string label):base(StructureIdentity.New<T>(), label)
     {
-
-    }    
-
+    }
 }

src/C4Sharp/Models/ContainerType.cs → src/C4Sharp/Elements/ContainerType.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// Container Type

src/C4Sharp/Models/Containers/Api.cs → src/C4Sharp/Elements/Containers/Api.cs

@@ -1,5 +1,5 @@
 
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record Api(string Alias, string Label, string Technology, string? Description = null) 
     : Container(Alias, Label, ContainerType.Api, Technology, Description);

src/C4Sharp/Models/Containers/BlobStore.cs → src/C4Sharp/Elements/Containers/BlobStore.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record BlobStore(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Blob, Technology, Description);

src/C4Sharp/Models/Containers/ClientDesktop.cs → src/C4Sharp/Elements/Containers/ClientDesktop.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ClientDesktop(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.ClientDesktop, Technology, Description);

src/C4Sharp/Models/Containers/ClientSideWebApp.cs → src/C4Sharp/Elements/Containers/ClientSideWebApp.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ClientSideWebApp(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Spa, Technology, Description);

src/C4Sharp/Models/Containers/Database.cs → src/C4Sharp/Elements/Containers/Database.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record Database(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Database, Technology, Description);

src/C4Sharp/Models/Containers/EventStreaming.cs → src/C4Sharp/Elements/Containers/EventStreaming.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record EventStreaming(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Topic, Technology, Description);

src/C4Sharp/Models/Containers/FileSystem.cs → src/C4Sharp/Elements/Containers/FileSystem.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record FileSystem(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.FileSystem, Technology, Description);

src/C4Sharp/Models/Containers/MessageBroker.cs → src/C4Sharp/Elements/Containers/MessageBroker.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record MessageBroker(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Queue, Technology, Description);

src/C4Sharp/Models/Containers/Mobile.cs → src/C4Sharp/Elements/Containers/Mobile.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record Mobile(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Mobile, Technology, Description);

src/C4Sharp/Models/Containers/Queue.cs → src/C4Sharp/Elements/Containers/Queue.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record Queue(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.Queue, Technology, Description);

src/C4Sharp/Models/Containers/ServerConsole.cs → src/C4Sharp/Elements/Containers/ServerConsole.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ServerConsole(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.ServerConsole, Technology, Description);

src/C4Sharp/Models/Containers/ServerSideWebApp.cs → src/C4Sharp/Elements/Containers/ServerSideWebApp.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ServerSideWebApp(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.WebApplication, Technology, Description);

src/C4Sharp/Models/Containers/ServerlessFunction.cs → src/C4Sharp/Elements/Containers/ServerlessFunction.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ServerlessFunction(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.ServerlessFunction, Technology, Description);

src/C4Sharp/Models/Containers/ShellScript.cs → src/C4Sharp/Elements/Containers/ShellScript.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Containers;
+namespace C4Sharp.Elements.Containers;
 
 public record ShellScript(string Alias, string Label, string Technology, string? Description = null)
     : Container(Alias, Label, ContainerType.ShellScript, Technology, Description);

src/C4Sharp/Models/DeploymentNode.cs → src/C4Sharp/Elements/DeploymentNode.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// A deployment node is something like physical infrastructure (e.g. a physical server or device),

src/C4Sharp/Models/EnterpriseBoundary.cs → src/C4Sharp/Elements/EnterpriseBoundary.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 public record EnterpriseBoundary(string Alias, string Label, params Structure[] Structures) : Structure(Alias, Label), IBoundary
 {

src/C4Sharp/Models/IBoundary.cs → src/C4Sharp/Elements/IBoundary.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 public interface IBoundary
 {

src/C4Sharp/Models/Person.cs → src/C4Sharp/Elements/Person.cs

@@ -1,6 +1,6 @@
-using C4Sharp.Models.Relationships;
+using C4Sharp.Elements.Relationships;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// A person represents one of the human users of your software system (e.g. actors, roles, personas, etc)

src/C4Sharp/Models/Plantuml/Constants/ElementName.cs → src/C4Sharp/Elements/Plantuml/Constants/ElementName.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Plantuml.Constants;
+namespace C4Sharp.Elements.Plantuml.Constants;
 
 public record ElementName
 {

src/C4Sharp/Models/Plantuml/Constants/LineStyle.cs → src/C4Sharp/Elements/Plantuml/Constants/LineStyle.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Plantuml.Constants;
+namespace C4Sharp.Elements.Plantuml.Constants;
 
 public record LineStyle
 {

src/C4Sharp/Models/Plantuml/Constants/Shape.cs → src/C4Sharp/Elements/Plantuml/Constants/Shape.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Plantuml.Constants;
+namespace C4Sharp.Elements.Plantuml.Constants;
 
 public record Shape
 {

src/C4Sharp/Models/Plantuml/ElementStyle.cs → src/C4Sharp/Elements/Plantuml/ElementStyle.cs

@@ -1,7 +1,7 @@
 using C4Sharp.Diagrams;
-using C4Sharp.Models.Plantuml.Constants;
+using C4Sharp.Elements.Plantuml.Constants;
 
-namespace C4Sharp.Models.Plantuml;
+namespace C4Sharp.Elements.Plantuml;
 
 public class ElementStyle : IElementStyle
 {

src/C4Sharp/Models/Plantuml/ElementTag.cs → src/C4Sharp/Elements/Plantuml/ElementTag.cs

@@ -1,7 +1,7 @@
 using C4Sharp.Diagrams;
-using C4Sharp.Models.Plantuml.Constants;
+using C4Sharp.Elements.Plantuml.Constants;
 
-namespace C4Sharp.Models.Plantuml;
+namespace C4Sharp.Elements.Plantuml;
 
 public class ElementTag : IElementTag
 {

src/C4Sharp/Models/Plantuml/Extensions/PlantumlDiagram.cs → src/C4Sharp/Elements/Plantuml/Extensions/PlantumlDiagram.cs

@@ -1,9 +1,8 @@
+using System.Text;
 using C4Sharp.Diagrams;
 using C4Sharp.FileSystem;
-using C4Sharp.Models.Plantuml.Constants;
-using System.Text;
 
-namespace C4Sharp.Models.Plantuml.Extensions;
+namespace C4Sharp.Elements.Plantuml.Extensions;
 
 /// <summary>
 /// Parser Diagram to PlantUML

src/C4Sharp/Models/Plantuml/Extensions/PlantumlRelationship.cs → src/C4Sharp/Elements/Plantuml/Extensions/PlantumlRelationship.cs

@@ -1,6 +1,6 @@
-using C4Sharp.Models.Relationships;
+using C4Sharp.Elements.Relationships;
 
-namespace C4Sharp.Models.Plantuml.Extensions;
+namespace C4Sharp.Elements.Plantuml.Extensions;
 
 /// <summary>
 /// Parser Relationship to PlantUML

src/C4Sharp/Models/Plantuml/Extensions/PlantumlStructure.cs → src/C4Sharp/Elements/Plantuml/Extensions/PlantumlStructure.cs

@@ -1,8 +1,8 @@
-using C4Sharp.Extensions;
-using C4Sharp.Models.Relationships;
 using System.Text;
+using C4Sharp.Commons;
+using C4Sharp.Elements.Relationships;
 
-namespace C4Sharp.Models.Plantuml.Extensions;
+namespace C4Sharp.Elements.Plantuml.Extensions;
 
 /// <summary>
 /// PlantUML Parser
@@ -54,7 +54,7 @@ private static string ToPumlString(this SoftwareSystemBoundary boundary)
 
         foreach (var container in boundary.Containers)
         {
-            stream.AppendLine($"{SpaceMethods.Indent()}{container.ToPumlString()}");
+            stream.AppendLine($"{TabIndentation.Indent()}{container.ToPumlString()}");
         }
 
         stream.AppendLine("}");
@@ -72,7 +72,7 @@ private static string ToPumlString(this EnterpriseBoundary boundary)
         {
             if (structure is Person or SoftwareSystem or EnterpriseBoundary)
             {
-                stream.AppendLine($"{SpaceMethods.Indent()}{structure.ToPumlString()}");
+                stream.AppendLine($"{TabIndentation.Indent()}{structure.ToPumlString()}");
             }
         }
 
@@ -122,15 +122,15 @@ private static string ToPumlString(this ContainerBoundary boundary)
         stream.AppendLine($"Container_Boundary({boundary.Alias}, \"{boundary.Label}\") {{");
         foreach (var component in boundary.Components)
         {
-            stream.AppendLine($"{SpaceMethods.Indent()}{component.ToPumlString()}");
+            stream.AppendLine($"{TabIndentation.Indent()}{component.ToPumlString()}");
         }
 
         if (boundary.Relationships.Any())
         {
             stream.AppendLine();
             foreach (var relationship in boundary.Relationships)
             {
-                stream.AppendLine($"{SpaceMethods.Indent()}{relationship.ToPumlString()}");
+                stream.AppendLine($"{TabIndentation.Indent()}{relationship.ToPumlString()}");
             }
         }
 
@@ -142,7 +142,7 @@ private static string ToPumlString(this ContainerBoundary boundary)
     private static string ToPumlString(this DeploymentNode deployment, int concat = 0)
     {
         var stream = new StringBuilder();
-        var spaces = SpaceMethods.Indent(concat);
+        var spaces = TabIndentation.Indent(concat);
 
         if (concat == 0)
         {
@@ -158,12 +158,12 @@ private static string ToPumlString(this DeploymentNode deployment, int concat =
 
         foreach (var node in deployment.Nodes)
         {
-            stream.AppendLine($"{node.ToPumlString(concat + SpaceMethods.TabSize)}");
+            stream.AppendLine($"{node.ToPumlString(concat + TabIndentation.TabSize)}");
         }
 
         if (deployment.Container != null)
         {
-            stream.AppendLine(SpaceMethods.Indent(concat) + deployment.Container.ToPumlString());
+            stream.AppendLine(TabIndentation.Indent(concat) + deployment.Container.ToPumlString());
         }
 
         stream.Append(spaces + "}");

src/C4Sharp/Models/Plantuml/IO/PlantumlContext.cs → src/C4Sharp/Elements/Plantuml/IO/PlantumlContext.cs

@@ -1,11 +1,10 @@
 using System.Diagnostics;
 using System.Text;
 using C4Sharp.Diagrams;
-using C4Sharp.Extensions;
+using C4Sharp.Elements.Plantuml.Extensions;
 using C4Sharp.FileSystem;
-using C4Sharp.Models.Plantuml.Extensions;
 
-namespace C4Sharp.Models.Plantuml.IO;
+namespace C4Sharp.Elements.Plantuml.IO;
 
 public partial class PlantumlContext : IDisposable
 {

src/C4Sharp/Models/Plantuml/IO/PlantumlException.cs → src/C4Sharp/Elements/Plantuml/IO/PlantumlException.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Plantuml.IO;
+namespace C4Sharp.Elements.Plantuml.IO;
 
 /// <summary>
 /// PlantumlException

src/C4Sharp/Models/Plantuml/IO/PlantumlResources.cs → src/C4Sharp/Elements/Plantuml/IO/PlantumlResources.cs

@@ -1,7 +1,7 @@
-using C4Sharp.Extensions;
+using C4Sharp.Commons;
 using C4Sharp.FileSystem;
 
-namespace C4Sharp.Models.Plantuml.IO;
+namespace C4Sharp.Elements.Plantuml.IO;
 
 internal static class PlantumlResources
 {
@@ -47,7 +47,7 @@ private static void LoadResource(string resourcesPath, string resourceName)
                 return;
             }
 
-            var stream = ResourceMethods.GetResourceContent(resourceName);
+            var stream = ResourceFile.ReadString(resourceName);
             Directory.CreateDirectory(resourcesPath);
             File.WriteAllText(path, stream);
         }
@@ -106,7 +106,7 @@ private static void LoadIconPngResource(string resourcesPath)
 
     private static void LoadStream(string path, string resourceName)
     {
-        var stream = ResourceMethods.GetResourceStream(resourceName) ?? throw new InvalidOperationException();
+        var stream = ResourceFile.ReadStream(resourceName) ?? throw new InvalidOperationException();
         using var file = new FileStream(path, FileMode.Create, FileAccess.Write);
         stream.CopyTo(file);
         stream.Flush();        

src/C4Sharp/Models/Plantuml/RelationshipTag.cs → src/C4Sharp/Elements/Plantuml/RelationshipTag.cs

@@ -1,7 +1,7 @@
 using C4Sharp.Diagrams;
-using C4Sharp.Models.Plantuml.Constants;
+using C4Sharp.Elements.Plantuml.Constants;
 
-namespace C4Sharp.Models.Plantuml;
+namespace C4Sharp.Elements.Plantuml;
 
 public class RelationshipTag : IRelationshipTag
 {

src/C4Sharp/Models/Relationships/Boundary.cs → src/C4Sharp/Elements/Relationships/Boundary.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Relationships;
+namespace C4Sharp.Elements.Relationships;
 
 /// <summary>
 /// Boundary scope

src/C4Sharp/Models/Relationships/Direction.cs → src/C4Sharp/Elements/Relationships/Direction.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Relationships;
+namespace C4Sharp.Elements.Relationships;
 
 /// <summary>
 /// Direction

src/C4Sharp/Models/Relationships/Position.cs → src/C4Sharp/Elements/Relationships/Position.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Relationships;
+namespace C4Sharp.Elements.Relationships;
 
 /// <summary>
 /// Positions

src/C4Sharp/Models/Relationships/Relationship.cs → src/C4Sharp/Elements/Relationships/Relationship.cs

@@ -1,4 +1,4 @@
-namespace C4Sharp.Models.Relationships;
+namespace C4Sharp.Elements.Relationships;
 
 /// <summary>
 /// Relationship

src/C4Sharp/Models/SoftwareSystem.cs → src/C4Sharp/Elements/SoftwareSystem.cs

@@ -1,6 +1,6 @@
-using C4Sharp.Models.Relationships;
+using C4Sharp.Elements.Relationships;
 
-namespace C4Sharp.Models;
+namespace C4Sharp.Elements;
 
 /// <summary>
 /// A software system is the highest level of abstraction and describes something that delivers value to its users,