diff --git a/kmip/services/kmip_client.py b/kmip/services/kmip_client.py
index 262fe22..36309ae 100644
--- a/kmip/services/kmip_client.py
+++ b/kmip/services/kmip_client.py
@@ -52,7 +52,7 @@ from kmip.core.messages import messages
 
 from kmip.core.messages import payloads
 
-from kmip.services.server.kmip_protocol import KMIPProtocol
+from kmip.services.kmip_protocol import KMIPProtocol
 
 from kmip.core.config_helper import ConfigHelper
 
diff --git a/kmip/services/server/kmip_protocol.py b/kmip/services/kmip_protocol.py
similarity index 100%
rename from kmip/services/server/kmip_protocol.py
rename to kmip/services/kmip_protocol.py
diff --git a/kmip/tests/unit/services/test_kmip_protocol.py b/kmip/tests/unit/services/test_kmip_protocol.py
index f188da3..e84e43a 100644
--- a/kmip/tests/unit/services/test_kmip_protocol.py
+++ b/kmip/tests/unit/services/test_kmip_protocol.py
@@ -18,9 +18,9 @@ from testtools import TestCase
 
 import binascii
 
-from kmip.services.server.kmip_protocol import KMIPProtocol
-from kmip.services.server.kmip_protocol import RequestLengthMismatch
-from kmip.services.server.kmip_protocol import KMIPProtocolFactory
+from kmip.services.kmip_protocol import KMIPProtocol
+from kmip.services.kmip_protocol import RequestLengthMismatch
+from kmip.services.kmip_protocol import KMIPProtocolFactory
 
 
 class TestKMIPProtocol(TestCase):