diff --git a/src/ServiceHost/MessageProtocol/Channel/ChannelBase.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Channel/ChannelBase.cs
rename to src/ServiceHost/ServiceHost/Protocol/Channel/ChannelBase.cs
diff --git a/src/ServiceHost/MessageProtocol/Channel/StdioClientChannel.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Channel/StdioClientChannel.cs
rename to src/ServiceHost/ServiceHost/Protocol/Channel/StdioClientChannel.cs
diff --git a/src/ServiceHost/MessageProtocol/Channel/StdioServerChannel.cs b/src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Channel/StdioServerChannel.cs
rename to src/ServiceHost/ServiceHost/Protocol/Channel/StdioServerChannel.cs
diff --git a/src/ServiceHost/MessageProtocol/Constants.cs b/src/ServiceHost/ServiceHost/Protocol/Constants.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Constants.cs
rename to src/ServiceHost/ServiceHost/Protocol/Constants.cs
diff --git a/src/ServiceHost/MessageProtocol/EventType.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/EventType.cs
rename to src/ServiceHost/ServiceHost/Protocol/Contracts/EventType.cs
diff --git a/src/ServiceHost/MessageProtocol/Message.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Message.cs
rename to src/ServiceHost/ServiceHost/Protocol/Contracts/Message.cs
diff --git a/src/ServiceHost/MessageProtocol/RequestType.cs b/src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/RequestType.cs
rename to src/ServiceHost/ServiceHost/Protocol/Contracts/RequestType.cs
diff --git a/src/ServiceHost/MessageProtocol/EventContext.cs b/src/ServiceHost/ServiceHost/Protocol/EventContext.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/EventContext.cs
rename to src/ServiceHost/ServiceHost/Protocol/EventContext.cs
diff --git a/src/ServiceHost/MessageProtocol/IMessageSender.cs b/src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/IMessageSender.cs
rename to src/ServiceHost/ServiceHost/Protocol/IMessageSender.cs
diff --git a/src/ServiceHost/MessageProtocol/MessageDispatcher.cs b/src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/MessageDispatcher.cs
rename to src/ServiceHost/ServiceHost/Protocol/MessageDispatcher.cs
diff --git a/src/ServiceHost/MessageProtocol/MessageParseException.cs b/src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/MessageParseException.cs
rename to src/ServiceHost/ServiceHost/Protocol/MessageParseException.cs
diff --git a/src/ServiceHost/MessageProtocol/MessageProtocolType.cs b/src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/MessageProtocolType.cs
rename to src/ServiceHost/ServiceHost/Protocol/MessageProtocolType.cs
diff --git a/src/ServiceHost/MessageProtocol/MessageReader.cs b/src/ServiceHost/ServiceHost/Protocol/MessageReader.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/MessageReader.cs
rename to src/ServiceHost/ServiceHost/Protocol/MessageReader.cs
diff --git a/src/ServiceHost/MessageProtocol/MessageWriter.cs b/src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/MessageWriter.cs
rename to src/ServiceHost/ServiceHost/Protocol/MessageWriter.cs
diff --git a/src/ServiceHost/MessageProtocol/ProtocolEndpoint.cs b/src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/ProtocolEndpoint.cs
rename to src/ServiceHost/ServiceHost/Protocol/ProtocolEndpoint.cs
diff --git a/src/ServiceHost/MessageProtocol/RequestContext.cs b/src/ServiceHost/ServiceHost/Protocol/RequestContext.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/RequestContext.cs
rename to src/ServiceHost/ServiceHost/Protocol/RequestContext.cs
diff --git a/src/ServiceHost/MessageProtocol/IMessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/IMessageSerializer.cs
rename to src/ServiceHost/ServiceHost/Protocol/Serializers/IMessageSerializer.cs
diff --git a/src/ServiceHost/MessageProtocol/Serializers/JsonRpcMessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Serializers/JsonRpcMessageSerializer.cs
rename to src/ServiceHost/ServiceHost/Protocol/Serializers/JsonRpcMessageSerializer.cs
diff --git a/src/ServiceHost/MessageProtocol/Serializers/V8MessageSerializer.cs b/src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs
similarity index 100%
rename from src/ServiceHost/MessageProtocol/Serializers/V8MessageSerializer.cs
rename to src/ServiceHost/ServiceHost/Protocol/Serializers/V8MessageSerializer.cs