diff --git a/DynamORM.Tests/Helpers/ProcedureParameterModels.cs b/DynamORM.Tests/Helpers/ProcedureParameterModels.cs
index d753425..2aa2328 100644
--- a/DynamORM.Tests/Helpers/ProcedureParameterModels.cs
+++ b/DynamORM.Tests/Helpers/ProcedureParameterModels.cs
@@ -5,6 +5,8 @@
  */
 
 using System.Data;
+using DynamORM.Mapper;
+using DynamORM.Objects;
 
 namespace DynamORM.Tests.Helpers
 {
diff --git a/DynamORM/Helpers/DynamicProcedureResultBinder.cs b/DynamORM/Helpers/DynamicProcedureResultBinder.cs
index 1845dff..fa283e9 100644
--- a/DynamORM/Helpers/DynamicProcedureResultBinder.cs
+++ b/DynamORM/Helpers/DynamicProcedureResultBinder.cs
@@ -31,6 +31,7 @@ using System.Collections.Generic;
 using System.Data;
 using System.Linq;
 using DynamORM.Mapper;
+using DynamORM.Objects;
 
 namespace DynamORM.Helpers
 {
diff --git a/DynamORM/ProcedureParameterAttribute.cs b/DynamORM/Mapper/ProcedureParameterAttribute.cs
similarity index 98%
rename from DynamORM/ProcedureParameterAttribute.cs
rename to DynamORM/Mapper/ProcedureParameterAttribute.cs
index c45586b..96474b8 100644
--- a/DynamORM/ProcedureParameterAttribute.cs
+++ b/DynamORM/Mapper/ProcedureParameterAttribute.cs
@@ -28,9 +28,8 @@
 
 using System;
 using System.Data;
-using DynamORM.Mapper;
 
-namespace DynamORM
+namespace DynamORM.Mapper
 {
     /// <summary>Declares metadata for object-based stored procedure parameters.</summary>
     [AttributeUsage(AttributeTargets.Property)]
diff --git a/DynamORM/ProcedureContracts.cs b/DynamORM/Objects/ProcedureContracts.cs
similarity index 98%
rename from DynamORM/ProcedureContracts.cs
rename to DynamORM/Objects/ProcedureContracts.cs
index b2c32c7..93eed9b 100644
--- a/DynamORM/ProcedureContracts.cs
+++ b/DynamORM/Objects/ProcedureContracts.cs
@@ -28,7 +28,7 @@
 
 using System.Data;
 
-namespace DynamORM
+namespace DynamORM.Objects
 {
     /// <summary>Marks an object as an explicit stored procedure parameter contract.</summary>
     public interface IProcedureParameters