11 files changed, 25 insertions, 10 deletions
diff --git a/crypto/src/asn1/cmp/CertificateConfirmationContent.cs b/crypto/src/cmp/CertificateConfirmationContent.cs
index 9f2f3e038..882bd2091 100644
--- a/crypto/src/asn1/cmp/CertificateConfirmationContent.cs
+++ b/crypto/src/cmp/CertificateConfirmationContent.cs
@@ -2,9 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 using Org.BouncyCastle.Cms;
+using Org.BouncyCastle.Asn1.Cmp;
 
 
-namespace Org.BouncyCastle.Asn1.Cmp
+namespace Org.BouncyCastle.Cmp
 {
     public class CertificateConfirmationContent
     {
diff --git a/crypto/src/asn1/cmp/CertificateConfirmationContentBuilder.cs b/crypto/src/cmp/CertificateConfirmationContentBuilder.cs
index b8c306f81..126484917 100644
--- a/crypto/src/asn1/cmp/CertificateConfirmationContentBuilder.cs
+++ b/crypto/src/cmp/CertificateConfirmationContentBuilder.cs
@@ -2,6 +2,8 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Text;
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Cmp;
 using Org.BouncyCastle.Asn1.X509;
 using Org.BouncyCastle.Cms;
 using Org.BouncyCastle.Crypto.IO;
@@ -9,7 +11,7 @@ using Org.BouncyCastle.Math;
 using Org.BouncyCastle.Security;
 using Org.BouncyCastle.X509;
 
-namespace Org.BouncyCastle.Asn1.Cmp
+namespace Org.BouncyCastle.Cmp
 {
     public class CertificateConfirmationContentBuilder
     {
diff --git a/crypto/src/asn1/cmp/CertificateStatus.cs b/crypto/src/cmp/CertificateStatus.cs
index d16c8e006..e8c3546dd 100644
--- a/crypto/src/asn1/cmp/CertificateStatus.cs
+++ b/crypto/src/cmp/CertificateStatus.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Org.BouncyCastle.Asn1.Cmp;
 using Org.BouncyCastle.Asn1.X509;
 using Org.BouncyCastle.Cms;
 using Org.BouncyCastle.Crypto.IO;
@@ -9,7 +10,7 @@ using Org.BouncyCastle.Security;
 using Org.BouncyCastle.Utilities;
 using Org.BouncyCastle.X509;
 
-namespace Org.BouncyCastle.Asn1.Cmp
+namespace Org.BouncyCastle.Cmp
 {
     public class CertificateStatus
     {
diff --git a/crypto/src/asn1/cmp/CmpException.cs b/crypto/src/cmp/CmpException.cs
index 0500b7d3e..7ecdf5af8 100644
--- a/crypto/src/asn1/cmp/CmpException.cs
+++ b/crypto/src/cmp/CmpException.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Text;
 
-namespace Org.BouncyCastle.Asn1.Cmp
+namespace Org.BouncyCastle.Cmp
 {
     public class CmpException : Exception
     {
diff --git a/crypto/src/asn1/crmf/AuthenticatorControl.cs b/crypto/src/crmf/AuthenticatorControl.cs
index 060088b1f..7803c4418 100644
--- a/crypto/src/asn1/crmf/AuthenticatorControl.cs
+++ b/crypto/src/crmf/AuthenticatorControl.cs
@@ -2,7 +2,10 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Crmf;
+
+namespace Org.BouncyCastle.Crmf
 {
     public class AuthenticatorControl:IControl
     {
diff --git a/crypto/src/asn1/crmf/CertificateRequestMessage.cs b/crypto/src/crmf/CertificateRequestMessage.cs
index b80c2a3fd..818facade 100644
--- a/crypto/src/asn1/crmf/CertificateRequestMessage.cs
+++ b/crypto/src/crmf/CertificateRequestMessage.cs
@@ -2,10 +2,12 @@
 using System.Collections.Generic;
 using System.Runtime.InteropServices;
 using System.Text;
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Crmf;
 using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Operators;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+namespace Org.BouncyCastle.Crmf
 {
     public class CertificateRequestMessage
     {
diff --git a/crypto/src/asn1/crmf/CertificateRequestMessageBuilder.cs b/crypto/src/crmf/CertificateRequestMessageBuilder.cs
index df604f4f5..53ebdf3f5 100644
--- a/crypto/src/asn1/crmf/CertificateRequestMessageBuilder.cs
+++ b/crypto/src/crmf/CertificateRequestMessageBuilder.cs
@@ -8,7 +8,7 @@ using Org.BouncyCastle.Crypto;
 using Org.BouncyCastle.Crypto.Operators;
 using Org.BouncyCastle.Math;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+namespace Org.BouncyCastle.Crmf
 {
     public class CertificateRequestMessageBuilder
     {
diff --git a/crypto/src/asn1/crmf/CrmfException.cs b/crypto/src/crmf/CrmfException.cs
index 7043ccd73..c80f480b7 100644
--- a/crypto/src/asn1/crmf/CrmfException.cs
+++ b/crypto/src/crmf/CrmfException.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Runtime.Serialization;
 using System.Text;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+namespace Org.BouncyCastle.Crmf
 {
     public class CrmfException : Exception
     {
diff --git a/crypto/src/asn1/crmf/Controls.cs b/crypto/src/crmf/IControl.cs
index 8f986168c..8f986168c 100644
--- a/crypto/src/asn1/crmf/Controls.cs
+++ b/crypto/src/crmf/IControl.cs
diff --git a/crypto/src/asn1/crmf/PkiArchiveControl.cs b/crypto/src/crmf/PkiArchiveControl.cs
index 0290fdfe6..ec8fb7671 100644
--- a/crypto/src/asn1/crmf/PkiArchiveControl.cs
+++ b/crypto/src/crmf/PkiArchiveControl.cs
@@ -1,10 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Text;
+using Org.BouncyCastle.Asn1;
 using Org.BouncyCastle.Asn1.Cms;
+using Org.BouncyCastle.Asn1.Crmf;
 using Org.BouncyCastle.Cms;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+namespace Org.BouncyCastle.Crmf
 {
     public class PkiArchiveControl:IControl
     {
diff --git a/crypto/src/asn1/crmf/RegTokenControl.cs b/crypto/src/crmf/RegTokenControl.cs
index 77bf32557..b53ce1922 100644
--- a/crypto/src/asn1/crmf/RegTokenControl.cs
+++ b/crypto/src/crmf/RegTokenControl.cs
@@ -2,7 +2,11 @@
 using System.Collections.Generic;
 using System.Text;
 
-namespace Org.BouncyCastle.Asn1.Crmf
+using Org.BouncyCastle.Crmf;
+using Org.BouncyCastle.Asn1;
+using Org.BouncyCastle.Asn1.Crmf;
+
+namespace Org.BouncyCastle.Crmf
 {
     public class RegTokenControl:IControl
     {