diff --git a/CSharp/Plugins/UniversalEditor.Essential/DataFormats/SecurityCertificate/DER/DERCertificateDataFormat.cs b/CSharp/Plugins/UniversalEditor.Essential/DataFormats/Security/Certificate/DER/DERCertificateDataFormat.cs
similarity index 73%
rename from CSharp/Plugins/UniversalEditor.Essential/DataFormats/SecurityCertificate/DER/DERCertificateDataFormat.cs
rename to CSharp/Plugins/UniversalEditor.Essential/DataFormats/Security/Certificate/DER/DERCertificateDataFormat.cs
index 19462e4f..98211d67 100644
--- a/CSharp/Plugins/UniversalEditor.Essential/DataFormats/SecurityCertificate/DER/DERCertificateDataFormat.cs
+++ b/CSharp/Plugins/UniversalEditor.Essential/DataFormats/Security/Certificate/DER/DERCertificateDataFormat.cs
@@ -7,9 +7,9 @@ using UniversalEditor.ObjectModels.AbstractSyntax;
 using UniversalEditor.DataFormats.AbstractSyntax.DER;
 
 using UniversalEditor.IO;
-using UniversalEditor.ObjectModels.SecurityCertificate;
+using UniversalEditor.ObjectModels.Security.Certificate;
 
-namespace UniversalEditor.DataFormats.SecurityCertificate.DER
+namespace UniversalEditor.DataFormats.Security.Certificate.DER
 {
 	public class DERCertificateDataFormat : DERDataFormat
 	{
@@ -19,7 +19,7 @@ namespace UniversalEditor.DataFormats.SecurityCertificate.DER
 			if (_dfr == null)
 			{
 				_dfr = new DataFormatReference(GetType());
-				_dfr.Capabilities.Add(typeof(SecurityCertificateObjectModel), DataFormatCapabilities.All);
+				_dfr.Capabilities.Add(typeof(CertificateObjectModel), DataFormatCapabilities.All);
 			}
 			return _dfr;
 		}
@@ -33,13 +33,13 @@ namespace UniversalEditor.DataFormats.SecurityCertificate.DER
 		{
 			base.AfterLoadInternal(objectModels);
 			AbstractSyntaxObjectModel asn = (objectModels.Pop() as AbstractSyntaxObjectModel);
-			SecurityCertificateObjectModel cer = (objectModels.Pop() as SecurityCertificateObjectModel);
+			CertificateObjectModel cer = (objectModels.Pop() as CertificateObjectModel);
 		}
 
 		protected override void BeforeSaveInternal(Stack<ObjectModel> objectModels)
 		{
 			base.BeforeSaveInternal(objectModels);
-			SecurityCertificateObjectModel cer = (objectModels.Pop() as SecurityCertificateObjectModel);
+			CertificateObjectModel cer = (objectModels.Pop() as CertificateObjectModel);
 			AbstractSyntaxObjectModel asn = new AbstractSyntaxObjectModel();
 
 			objectModels.Push(asn);
diff --git a/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/SecurityCertificate/SecurityCertificateObjectModel.cs b/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Security/Certificate/CertificateObjectModel.cs
similarity index 81%
rename from CSharp/Plugins/UniversalEditor.Essential/ObjectModels/SecurityCertificate/SecurityCertificateObjectModel.cs
rename to CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Security/Certificate/CertificateObjectModel.cs
index d2fa2ba4..76a5fd29 100644
--- a/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/SecurityCertificate/SecurityCertificateObjectModel.cs
+++ b/CSharp/Plugins/UniversalEditor.Essential/ObjectModels/Security/Certificate/CertificateObjectModel.cs
@@ -3,9 +3,9 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 
-namespace UniversalEditor.ObjectModels.SecurityCertificate
+namespace UniversalEditor.ObjectModels.Security.Certificate
 {
-	public class SecurityCertificateObjectModel : ObjectModel
+	public class CertificateObjectModel : ObjectModel
 	{
 		private static ObjectModelReference _omr = null;
 		protected override ObjectModelReference MakeReferenceInternal()
diff --git a/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj b/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj
index 055a7809..4b07af31 100644
--- a/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj
+++ b/CSharp/Plugins/UniversalEditor.Essential/UniversalEditor.Essential.csproj
@@ -61,7 +61,7 @@
     <Compile Include="DataFormats\PropertyList\WindowsConfigurationDataFormat.cs" />
     <Compile Include="DataFormats\PropertyList\XML\XMLPropertyListDataFormat.cs" />
     <Compile Include="DataFormats\RichTextMarkup\RTML\RTMLSettings.cs" />
-    <Compile Include="DataFormats\SecurityCertificate\DER\DERCertificateDataFormat.cs" />
+    <Compile Include="DataFormats\Security\Certificate\DER\DERCertificateDataFormat.cs" />
     <Compile Include="DataFormats\Shortcut\FreeDesktop\DesktopShortcutAction.cs" />
     <Compile Include="DataFormats\Shortcut\FreeDesktop\DesktopShortcutDataFormat.cs" />
     <Compile Include="DataFormats\Shortcut\FreeDesktop\DesktopShortcutStartupNotifyBehavior.cs" />
@@ -108,7 +108,7 @@
     <Compile Include="ObjectModels\RichTextMarkup\RichTextMarkupItemLiteral.cs" />
     <Compile Include="ObjectModels\RichTextMarkup\RichTextMarkupObjectModel.cs" />
     <Compile Include="ObjectModels\RichTextMarkup\RichTextMarkupItemTag.cs" />
-    <Compile Include="ObjectModels\SecurityCertificate\SecurityCertificateObjectModel.cs" />
+    <Compile Include="ObjectModels\Security\Certificate\CertificateObjectModel.cs" />
     <Compile Include="ObjectModels\Shortcut\ShortcutObjectModel.cs" />
     <Compile Include="ObjectModels\Solution\SolutionObjectModel.cs" />
     <Compile Include="ObjectModels\Text\Formatted\FormattedTextFont.cs" />