diff --git a/Source/Core/Core.csproj b/Source/Core/Core.csproj
index 1c713ef..466e58a 100644
--- a/Source/Core/Core.csproj
+++ b/Source/Core/Core.csproj
@@ -89,15 +89,10 @@
     <Compile Include="Persistence\ContactGroups\ContactGroupQueryExecutor.cs" />
     <Compile Include="Persistence\ContactGroups\ContactGroupRepository.cs" />
     <Compile Include="Persistence\ContactGroups\ContactGroupMemberRelationshipQueryExecutor.cs" />
-    <Compile Include="Persistence\ContactGroups\IContactGroupMemberQueryExecutor.cs" />
-    <Compile Include="Persistence\ContactGroups\IContactGroupQueryExecutor.cs" />
     <Compile Include="Persistence\ContactGroups\PersistedContactGroup.cs" />
     <Compile Include="Persistence\ContactGroups\PersistedContactGroupMember.cs" />
     <Compile Include="Persistence\Contacts\ContactEmailAddressQueryExecutor.cs" />
     <Compile Include="Persistence\Contacts\ContactPhoneNumberQueryExecutor.cs" />
-    <Compile Include="Persistence\Contacts\IContactPhoneNumberQueryExecutor.cs" />
-    <Compile Include="Persistence\Contacts\IContactEmailAddressQueryExecutor.cs" />
-    <Compile Include="Persistence\Contacts\IContactQueryExecutor.cs" />
     <Compile Include="Persistence\Contacts\ContactQueryExecutor.cs" />
     <Compile Include="Persistence\Contacts\ContactRepository.cs" />
     <Compile Include="Persistence\Contacts\PersistedContact.cs" />
diff --git a/Source/Core/Persistence/ContactGroups/ContactGroupMemberQueryExecutor.cs b/Source/Core/Persistence/ContactGroups/ContactGroupMemberQueryExecutor.cs
index 6513881..23c3e16 100644
--- a/Source/Core/Persistence/ContactGroups/ContactGroupMemberQueryExecutor.cs
+++ b/Source/Core/Persistence/ContactGroups/ContactGroupMemberQueryExecutor.cs
@@ -14,4 +14,10 @@ public void DeleteByContactGroupId(long contactGroupId)
             SqlMapper.Delete("DeleteContactGroupMembersByContactGroupId", contactGroupId);
         }
     }
+
+    public interface IContactGroupMemberQueryExecutor
+    {
+        void Insert(ContactGroupMember contactGroupMember);
+        void DeleteByContactGroupId(long contactGroupId);
+    }
 }
\ No newline at end of file
diff --git a/Source/Core/Persistence/ContactGroups/ContactGroupQueryExecutor.cs b/Source/Core/Persistence/ContactGroups/ContactGroupQueryExecutor.cs
index 5f5457d..37d4ef2 100644
--- a/Source/Core/Persistence/ContactGroups/ContactGroupQueryExecutor.cs
+++ b/Source/Core/Persistence/ContactGroups/ContactGroupQueryExecutor.cs
@@ -31,4 +31,13 @@ public void DeleteByIdentifier(Guid identifier)
             SqlMapper.Delete("DeleteContactGroupByIdentifier", identifier);
         }
     }
+
+    public interface IContactGroupQueryExecutor
+    {
+        void Insert(IContactGroup contactGroup);
+        void Update(IContactGroup contactGroup);
+        List<IContactGroup> SelectAll();
+        IContactGroup SelectByIdentifier(Guid identifier);
+        void DeleteByIdentifier(Guid identifier);
+    }
 }
\ No newline at end of file
diff --git a/Source/Core/Persistence/ContactGroups/IContactGroupMemberQueryExecutor.cs b/Source/Core/Persistence/ContactGroups/IContactGroupMemberQueryExecutor.cs
deleted file mode 100644
index e502d7e..0000000
--- a/Source/Core/Persistence/ContactGroups/IContactGroupMemberQueryExecutor.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EthanYoung.ContactRepository.ContactGroups;
-
-namespace EthanYoung.ContactRepository.Persistence.ContactGroups
-{
-    public interface IContactGroupMemberQueryExecutor
-    {
-        void Insert(ContactGroupMember contactGroupMember);
-        void DeleteByContactGroupId(long contactGroupId);
-    }
-}
\ No newline at end of file
diff --git a/Source/Core/Persistence/ContactGroups/IContactGroupQueryExecutor.cs b/Source/Core/Persistence/ContactGroups/IContactGroupQueryExecutor.cs
deleted file mode 100644
index b444982..0000000
--- a/Source/Core/Persistence/ContactGroups/IContactGroupQueryExecutor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EthanYoung.ContactRepository.ContactGroups;
-
-namespace EthanYoung.ContactRepository.Persistence.ContactGroups
-{
-    public interface IContactGroupQueryExecutor
-    {
-        void Insert(IContactGroup contactGroup);
-        void Update(IContactGroup contactGroup);
-        List<IContactGroup> SelectAll();
-        IContactGroup SelectByIdentifier(Guid identifier);
-        void DeleteByIdentifier(Guid identifier); 
-    }
-}
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/ContactEmailAddressQueryExecutor.cs b/Source/Core/Persistence/Contacts/ContactEmailAddressQueryExecutor.cs
index f6657c1..41700a7 100644
--- a/Source/Core/Persistence/Contacts/ContactEmailAddressQueryExecutor.cs
+++ b/Source/Core/Persistence/Contacts/ContactEmailAddressQueryExecutor.cs
@@ -14,4 +14,10 @@ public void DeleteByContactId(long contactId)
             SqlMapper.Delete("DeleteContactEmailAddressesByContactId", contactId);
         }
     }
+
+    public interface IContactEmailAddressQueryExecutor
+    {
+        void Insert(ContactEmailAddress contactEmailAddress);
+        void DeleteByContactId(long contactId);
+    }
 }
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/ContactPhoneNumberQueryExecutor.cs b/Source/Core/Persistence/Contacts/ContactPhoneNumberQueryExecutor.cs
index 97e090a..5cd4ed7 100644
--- a/Source/Core/Persistence/Contacts/ContactPhoneNumberQueryExecutor.cs
+++ b/Source/Core/Persistence/Contacts/ContactPhoneNumberQueryExecutor.cs
@@ -14,4 +14,10 @@ public void DeleteByContactId(long contactId)
             SqlMapper.Delete("DeleteContactPhoneNumbersByContactId", contactId);
         }
     }
+
+    public interface IContactPhoneNumberQueryExecutor
+    {
+        void Insert(ContactPhoneNumber contactPhoneNumber);
+        void DeleteByContactId(long contactId);
+    }
 }
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/ContactQueryExecutor.cs b/Source/Core/Persistence/Contacts/ContactQueryExecutor.cs
index 0bdd7c2..6720836 100644
--- a/Source/Core/Persistence/Contacts/ContactQueryExecutor.cs
+++ b/Source/Core/Persistence/Contacts/ContactQueryExecutor.cs
@@ -31,4 +31,13 @@ public void DeleteByIdentifier(Guid identifier)
             SqlMapper.Delete("DeleteContactByIdentifier", identifier);
         }
     }
+
+    public interface IContactQueryExecutor
+    {
+        void Insert(IContact contact);
+        void Update(IContact contact);
+        List<IContact> SelectAll();
+        IContact SelectByIdentifier(Guid identifier);
+        void DeleteByIdentifier(Guid identifier);
+    }
 }
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/IContactEmailAddressQueryExecutor.cs b/Source/Core/Persistence/Contacts/IContactEmailAddressQueryExecutor.cs
deleted file mode 100644
index 0b1d1db..0000000
--- a/Source/Core/Persistence/Contacts/IContactEmailAddressQueryExecutor.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EthanYoung.ContactRepository.Contacts;
-
-namespace EthanYoung.ContactRepository.Persistence.Contacts
-{
-    public interface IContactEmailAddressQueryExecutor
-    {
-        void Insert(ContactEmailAddress contactEmailAddress);
-        void DeleteByContactId(long contactId);
-    }
-}
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/IContactPhoneNumberQueryExecutor.cs b/Source/Core/Persistence/Contacts/IContactPhoneNumberQueryExecutor.cs
deleted file mode 100644
index 986897a..0000000
--- a/Source/Core/Persistence/Contacts/IContactPhoneNumberQueryExecutor.cs
+++ /dev/null
@@ -1,10 +0,0 @@
-using EthanYoung.ContactRepository.Contacts;
-
-namespace EthanYoung.ContactRepository.Persistence.Contacts
-{
-    public interface IContactPhoneNumberQueryExecutor
-    {
-        void Insert(ContactPhoneNumber contactPhoneNumber);
-        void DeleteByContactId(long contactId);
-    }
-}
\ No newline at end of file
diff --git a/Source/Core/Persistence/Contacts/IContactQueryExecutor.cs b/Source/Core/Persistence/Contacts/IContactQueryExecutor.cs
deleted file mode 100644
index 3487377..0000000
--- a/Source/Core/Persistence/Contacts/IContactQueryExecutor.cs
+++ /dev/null
@@ -1,15 +0,0 @@
-using System;
-using System.Collections.Generic;
-using EthanYoung.ContactRepository.Contacts;
-
-namespace EthanYoung.ContactRepository.Persistence.Contacts
-{
-    public interface IContactQueryExecutor
-    {
-        void Insert(IContact contact);
-        void Update(IContact contact);
-        List<IContact> SelectAll();
-        IContact SelectByIdentifier(Guid identifier);
-        void DeleteByIdentifier(Guid identifier);
-    }
-}
\ No newline at end of file