diff --git a/Common/Common.cd b/Common/Common.cd
index a46d5dc..348886f 100644
--- a/Common/Common.cd
+++ b/Common/Common.cd
@@ -43,7 +43,7 @@
   <Class Name="Common.Helpers.EnumHelpers" Collapsed="true">
     <Position X="3" Y="1.75" Width="1.5" />
     <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
+      <HashCode>AAAAAAAAAAAAEAAAAAAAAAAAAAAAAAAAAAAAAIAAAAA=</HashCode>
       <FileName>Helpers\EnumHelpers.cs</FileName>
     </TypeIdentifier>
   </Class>
@@ -93,14 +93,14 @@
     </TypeIdentifier>
   </Class>
   <Interface Name="Common.IContext" Collapsed="true">
-    <Position X="12.5" Y="1" Width="1.5" />
+    <Position X="12.25" Y="1" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAAAAAAACYAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=</HashCode>
       <FileName>IContext.cs</FileName>
     </TypeIdentifier>
   </Interface>
   <Interface Name="Common.AppSettings.IAppSettingsProvider" Collapsed="true">
-    <Position X="0.5" Y="1" Width="1.75" />
+    <Position X="0.5" Y="1" Width="2" />
     <TypeIdentifier>
       <HashCode>AAAAgIAAAAAAABAAAAAAAAAIAAAAAAAAAAIAAABAAAA=</HashCode>
       <FileName>AppSettings\IAppSettingsProvider.cs</FileName>
diff --git a/MultiTerm.Core/Core.cd b/MultiTerm.Core/Core.cd
deleted file mode 100644
index f62e020..0000000
--- a/MultiTerm.Core/Core.cd
+++ /dev/null
@@ -1,145 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<ClassDiagram MajorVersion="1" MinorVersion="1" GroupingSetting="Access" MembersFormat="NameAndType">
-  <Class Name="MultiTerm.Core.Factories.TerminalViewModelFactory" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="13.5" Y="3.75" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAgAAAAAIAAAAAAAAAAAEAAAAAAAAAAAAA=</HashCode>
-      <FileName>Factories\TerminalViewModelFactory.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.Helpers.ServiceExtensions" Collapsed="true">
-    <Position X="16" Y="2.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAA=</HashCode>
-      <FileName>Helpers\ServiceExtensions.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="MultiTerm.Core.Model.FormattedCharacter" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="5.25" Y="1.75" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAACAA=</HashCode>
-      <FileName>Model\FormattedCharacter.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.Model.MultiFormatString" Collapsed="true">
-    <Position X="2" Y="0.75" Width="2.75" />
-    <TypeIdentifier>
-      <HashCode>AACAAABAAAAAEwAAAAACAAAAAAFAAAAEAAAEAAAAoAA=</HashCode>
-      <FileName>Model\MultiFormatString.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="MultiTerm.Core.Model.SpacingCharacter" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="7.25" Y="1.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA=</HashCode>
-      <FileName>Model\SpacingCharacter.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.Types.ProtocolNotConnectedMessage" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="13.5" Y="1.5" Width="2.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAgAAAAAEAAAAAAAIAAAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Types\ProtocolNotConnectedMessage.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.ViewModel.ByteDataViewModel" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="5.5" Y="4" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAABAAAAAAABAAAAAAAAAAIABAAAAAAAAAAYAAAIAAA=</HashCode>
-      <FileName>ViewModel\ByteDataViewModel.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.ViewModel.CommunicationDataViewModel" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="7.75" Y="4" Width="2.5" />
-    <TypeIdentifier>
-      <HashCode>gAAAAAAAABAAABAAAAAQAgACAIAAAAAAAgAQQgBIAAA=</HashCode>
-      <FileName>ViewModel\CommunicationDataViewModel.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.ViewModel.SendReceiveViewModel" Collapsed="true">
-    <Position X="0.5" Y="4.75" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAACAAAAgA=</HashCode>
-      <FileName>ViewModel\SendReceiveViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Class>
-  <Class Name="MultiTerm.Core.ViewModel.ShellViewModel" Collapsed="true" BaseTypeListCollapsed="true">
-    <Position X="3" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAFAAIAIACAAACEAgEABkAAAAAAgAQABBBAFAAAAA=</HashCode>
-      <FileName>ViewModel\ShellViewModel.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Class Name="MultiTerm.Core.ViewModel.TerminalViewModel" Collapsed="true">
-    <Position X="0.75" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>EAQCUCCAQIAAIgAgAEAGBAgAAAAERKIAAARgCAAAAAA=</HashCode>
-      <FileName>ViewModel\TerminalViewModel.cs</FileName>
-    </TypeIdentifier>
-    <Lollipop Position="0.2" />
-  </Class>
-  <Interface Name="MultiTerm.Core.Factories.ITerminalViewModelFactory" Collapsed="true">
-    <Position X="13.5" Y="2.75" Width="2.25" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAAAAAAAAAAA=</HashCode>
-      <FileName>Factories\ITerminalViewModelFactory.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="MultiTerm.Core.Model.IFormattedCharacter" Collapsed="true">
-    <Position X="6" Y="0.75" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAA=</HashCode>
-      <FileName>Model\IFormattedCharacter.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="MultiTerm.Core.ViewModel.ICommunicationDataViewModel&lt;T_Data, T_Raw&gt;" Collapsed="true">
-    <Position X="7.5" Y="3" Width="3.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAACAAAAAAAAAAAEAAAABAAAgAAQAAAAAI=</HashCode>
-      <FileName>ViewModel\ICommunicationDataViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="MultiTerm.Core.ViewModel.IDataViewModel" Collapsed="true">
-    <Position X="5.5" Y="3" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAAAAAAAAAIACAAQAAAAAAAAAAAAAAAAgAAAAAAQA=</HashCode>
-      <FileName>ViewModel\IDataViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Interface Name="MultiTerm.Core.ViewModel.ITerminalViewModel" Collapsed="true">
-    <Position X="0.75" Y="2" Width="1.75" />
-    <TypeIdentifier>
-      <HashCode>AAAAACAAAAAAAkAAAAIEAAAAAAAAAAAAAAAgCAAEAAA=</HashCode>
-      <FileName>ViewModel\ITerminalViewModel.cs</FileName>
-    </TypeIdentifier>
-  </Interface>
-  <Enum Name="MultiTerm.Core.Types.FormatType" Collapsed="true">
-    <Position X="11.5" Y="0.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AAAAEAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAACAA=</HashCode>
-      <FileName>Types\FormatType.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="MultiTerm.Core.Types.NewlineSeparatorType" Collapsed="true">
-    <Position X="9.75" Y="1.5" Width="2" />
-    <TypeIdentifier>
-      <HashCode>AAAAgAAAAAAAAAAAAAAAAQAAAACAAAAAAAAAAAEAAAA=</HashCode>
-      <FileName>Types\NewlineSeparatorType.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Enum Name="MultiTerm.Core.Types.TerminalViewType" Collapsed="true">
-    <Position X="9.75" Y="0.75" Width="1.5" />
-    <TypeIdentifier>
-      <HashCode>AACAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAA=</HashCode>
-      <FileName>Types\TerminalViewType.cs</FileName>
-    </TypeIdentifier>
-  </Enum>
-  <Font Name="Segoe UI" Size="9" />
-</ClassDiagram>
\ No newline at end of file
diff --git a/MultiTerm.Core/TerminalViewModel.cd b/MultiTerm.Core/TerminalViewModel.cd
new file mode 100644
index 0000000..e138639
--- /dev/null
+++ b/MultiTerm.Core/TerminalViewModel.cd
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ClassDiagram MajorVersion="1" MinorVersion="1" GroupingSetting="Access" MembersFormat="NameAndType">
+  <Class Name="MultiTerm.Core.ViewModel.SendReceiveViewModel" Collapsed="true">
+    <Position X="4.75" Y="5.75" Width="2" />
+    <Compartments>
+      <Compartment Name="Public" Collapsed="true" />
+      <Compartment Name="Private" Collapsed="true" />
+    </Compartments>
+    <InheritanceLine Type="MultiTerm.Core.ViewModel.TerminalViewModel" ManuallyRouted="true">
+      <Path>
+        <Point X="6.875" Y="4.941" />
+        <Point X="6.875" Y="5.375" />
+        <Point X="5.75" Y="5.375" />
+        <Point X="5.75" Y="5.75" />
+      </Path>
+    </InheritanceLine>
+    <TypeIdentifier>
+      <HashCode>AAAAAAAAAAAAAAAAAEAAAAAAAAAAAAAAAAAACAAAAgA=</HashCode>
+      <FileName>ViewModel\SendReceiveViewModel.cs</FileName>
+    </TypeIdentifier>
+  </Class>
+  <Class Name="MultiTerm.Core.ViewModel.TerminalViewModel" Collapsed="true">
+    <Position X="4.75" Y="4.25" Width="4.25" />
+    <TypeIdentifier>
+      <HashCode>EAQCUCCAQIAAIgAgEEAGBAgAAAAFRKYAAARgCAAAAAA=</HashCode>
+      <FileName>ViewModel\TerminalViewModel.cs</FileName>
+    </TypeIdentifier>
+    <Lollipop Position="0.2" />
+  </Class>
+  <Interface Name="MultiTerm.Core.ViewModel.ITerminalViewModel">
+    <Position X="0.5" Y="4" Width="4" />
+    <TypeIdentifier>
+      <HashCode>AAAAACAAAAAAAkAAAAIEAAAAAAAAAAAAAAAgCAAEAAA=</HashCode>
+      <FileName>ViewModel\ITerminalViewModel.cs</FileName>
+    </TypeIdentifier>
+  </Interface>
+  <Font Name="Segoe UI" Size="9" />
+</ClassDiagram>
\ No newline at end of file