diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/ExecutionPlanGraph.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/ExecutionPlanGraph.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/ExecutionPlanGraph.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/ExecutionPlanGraph.cs
index 0f5adc79..e548b91f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/ExecutionPlanGraph.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/ExecutionPlanGraph.cs
@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
 {
     /// <summary>
     /// Execution plan graph object that is sent over JSON RPC
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/GetExecutionPlanRequest.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/GetExecutionPlanRequest.cs
similarity index 93%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/GetExecutionPlanRequest.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/GetExecutionPlanRequest.cs
index 3d3e5286..b483936d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/Contracts/GetExecutionPlanRequest.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/Contracts/GetExecutionPlanRequest.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
 {
     public class GetExecutionPlanParams
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ExecutionPlanService.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ExecutionPlanService.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ExecutionPlanService.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ExecutionPlanService.cs
index f83ed44c..59684b87 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ExecutionPlanService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ExecutionPlanService.cs
@@ -8,7 +8,7 @@ using System.Threading.Tasks;
 using Microsoft.SqlTools.Hosting.Protocol;
 using Microsoft.SqlTools.ServiceLayer.Hosting;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
 {
     /// <summary>
     /// Main class for Migration Service functionality
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ActualPlanDataReaderNodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ActualPlanDataReaderNodeBuilder.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ActualPlanDataReaderNodeBuilder.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ActualPlanDataReaderNodeBuilder.cs
index c1418b09..2ff4a797 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ActualPlanDataReaderNodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ActualPlanDataReaderNodeBuilder.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Builds hierarchy of Graph objects from SQL 2000 Actual ShowPlan Record Set
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Attributes.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Attributes.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Attributes.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Attributes.cs
index 0bc25c2a..244466e6 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Attributes.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Attributes.cs
@@ -8,7 +8,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     #region FloatTypeConverter
 
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonManager.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonManager.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonManager.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonManager.cs
index fbdd588a..07f91b8b 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonManager.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonManager.cs
@@ -6,7 +6,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph.Comparison
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan.Comparison
 {
     /// <summary>
     /// Handles operations for creating and comparing skeletons of showplan trees
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonNode.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonNode.cs
index e2f1442c..ff3169fd 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Comparison/SkeletonNode.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Comparison/SkeletonNode.cs
@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph.Comparison
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan.Comparison
 {
     public class SkeletonNode
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ConditionParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ConditionParser.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ConditionParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ConditionParser.cs
index 1ff0d72c..97d32810 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ConditionParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ConditionParser.cs
@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     internal sealed class ConditionParser : XmlPlanHierarchyParser
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Constants.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Constants.cs
similarity index 83%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Constants.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Constants.cs
index 57f4819a..684c19ad 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Constants.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Constants.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class Constants
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorOperationParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorOperationParser.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorOperationParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorOperationParser.cs
index c6221d62..5a269b5f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorOperationParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorOperationParser.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses StmtCursorType ShowPlan XML nodes
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorStatementParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorStatementParser.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorStatementParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorStatementParser.cs
index cac8f74c..e51b3acc 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/CursorStatementParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/CursorStatementParser.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses StmtCursorType ShowPlan XML nodes
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/DataReaderNodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/DataReaderNodeBuilder.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/DataReaderNodeBuilder.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/DataReaderNodeBuilder.cs
index f6d8631a..6eade159 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/DataReaderNodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/DataReaderNodeBuilder.cs
@@ -11,7 +11,7 @@ using System.Diagnostics;
 using System.Globalization;
 using System.Text.RegularExpressions;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Base class for building hierarchy of Graph objects from ShowPlan Record Set
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Description.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Description.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Description.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Description.cs
index bf2e9b8f..4c5d3340 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Description.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Description.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class Description
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Edge.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Edge.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Edge.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Edge.cs
index 0c601353..c8bcd748 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Edge.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Edge.cs
@@ -7,7 +7,7 @@ using System;
 using System.ComponentModel;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class Edge
 	{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/EstimatedPlanDataReaderNodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/EstimatedPlanDataReaderNodeBuilder.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/EstimatedPlanDataReaderNodeBuilder.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/EstimatedPlanDataReaderNodeBuilder.cs
index 2b40399f..f9f03f5d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/EstimatedPlanDataReaderNodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/EstimatedPlanDataReaderNodeBuilder.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Builds hierarchy of Graph objects from SQL 2000 Estimated ShowPlan Record Set
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableArrayWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableArrayWrapper.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableArrayWrapper.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableArrayWrapper.cs
index 61be1752..ad93ea25 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableArrayWrapper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableArrayWrapper.cs
@@ -8,7 +8,7 @@ using System.Collections;
 using System.Globalization;
 using System.Text;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
 
     public class ExpandableArrayWrapper : ExpandableObjectWrapper
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableObjectWrapper.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableObjectWrapper.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableObjectWrapper.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableObjectWrapper.cs
index 44442372..6f5f9e41 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ExpandableObjectWrapper.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ExpandableObjectWrapper.cs
@@ -6,7 +6,7 @@
 using System;
 using System.ComponentModel;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class ExpandableObjectWrapper : ObjectParser, ICustomTypeDescriptor
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FilterTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FilterTypeParser.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FilterTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FilterTypeParser.cs
index 4c644efc..b79ff1ad 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FilterTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FilterTypeParser.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses ShowPlan XML objects derived from RelOpBaseType type
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FunctionTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FunctionTypeParser.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FunctionTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FunctionTypeParser.cs
index 575126a1..5c7721e9 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/FunctionTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/FunctionTypeParser.cs
@@ -5,7 +5,7 @@
 
 using System.ComponentModel;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     internal sealed class FunctionTypeParser : XmlPlanParser
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Graph.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Graph.cs
similarity index 80%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Graph.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Graph.cs
index 8461d346..6f092f81 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Graph.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Graph.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class Graph
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/INodeBuilder.cs
similarity index 91%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/INodeBuilder.cs
index 2d66505e..c19bf372 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/INodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/INodeBuilder.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Interface represents an abstract builder that gets
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IXmlBatchParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IXmlBatchParser.cs
similarity index 94%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IXmlBatchParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IXmlBatchParser.cs
index 71e54664..b4b86b03 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IXmlBatchParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IXmlBatchParser.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Interface represents ability to split an data source containing multiple
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IndexOpTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IndexOpTypeParser.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IndexOpTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IndexOpTypeParser.cs
index 640c7285..e03d0859 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/IndexOpTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/IndexOpTypeParser.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses ShowPlan XML objects derived from RelOpBaseType type
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/MergeTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/MergeTypeParser.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/MergeTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/MergeTypeParser.cs
index 6e656a77..fe031723 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/MergeTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/MergeTypeParser.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses ShowPlan XML objects derived from RelOpBaseType type
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Node.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Node.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Node.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Node.cs
index 93fdc3a3..740dd41f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Node.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Node.cs
@@ -9,7 +9,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Status of operator
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderContext.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderContext.cs
similarity index 94%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderContext.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderContext.cs
index a1b91c6e..70aa89ef 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderContext.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderContext.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public class NodeBuilderContext
 	{
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderFactory.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderFactory.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderFactory.cs
index 2510fd33..29569f19 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/NodeBuilderFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/NodeBuilderFactory.cs
@@ -7,7 +7,7 @@ using System;
 using System.Data;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Class that creates concrete INodeBuilder instances.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectParser.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectParser.cs
index 9feb0e1c..b8825dc4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectParser.cs
@@ -7,7 +7,7 @@ using System;
 using System.ComponentModel;
 using System.Collections;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Base class for all object / Node parsers
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectWrapperTypeConverter.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectWrapperTypeConverter.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectWrapperTypeConverter.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectWrapperTypeConverter.cs
index 99338c37..4882ac8d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/ObjectWrapperTypeConverter.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/ObjectWrapperTypeConverter.cs
@@ -13,7 +13,7 @@ using System.Reflection;
 using System.Text;
 using System.Xml;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// This class converts methods for converting from ShowPlanXML native classes
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Operation.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Operation.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Operation.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Operation.cs
index 74ac3fd7..bfeaff11 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/Operation.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/Operation.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     public sealed class Operation
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/OperationTable.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/OperationTable.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/OperationTable.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/OperationTable.cs
index 41dba8ff..b2270b52 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/OperationTable.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/OperationTable.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Reflection;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// A class that holds information about a physical or logical operator, or a statement.
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyFactory.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyFactory.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyFactory.cs
index be8d63f0..53fda3a4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyFactory.cs
@@ -9,7 +9,7 @@ using System.Xml.Serialization;
 using System.Reflection;
 using System.Collections;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// PropertyFactory creates properties based on template properties (this class public properties)
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyValue.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyValue.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyValue.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyValue.cs
index f5d1f69e..b1a22c5d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/PropertyValue.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/PropertyValue.cs
@@ -7,7 +7,7 @@ using System;
 using System.Collections;
 using System.ComponentModel;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
 	internal sealed class PropertyValue : PropertyDescriptor
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpBaseTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpBaseTypeParser.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpBaseTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpBaseTypeParser.cs
index bf9d2a8b..b4e4bb88 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpBaseTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpBaseTypeParser.cs
@@ -6,7 +6,7 @@
 using System.ComponentModel;
 using System.Collections;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses ShowPlan XML objects derived from RelOpBaseType type
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpTypeParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpTypeParser.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpTypeParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpTypeParser.cs
index 9645a538..a75424b2 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RelOpTypeParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RelOpTypeParser.cs
@@ -10,7 +10,7 @@ using System.ComponentModel;
 using System.Diagnostics;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     internal sealed class RelOpTypeParser : XmlPlanParser
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RunTimeCounters.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RunTimeCounters.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RunTimeCounters.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RunTimeCounters.cs
index a305e242..64778e13 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/RunTimeCounters.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/RunTimeCounters.cs
@@ -8,7 +8,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// RunTimeCounters class stores RunTimeCountersPerThread information
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/StatementParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/StatementParser.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/StatementParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/StatementParser.cs
index 36da3211..a91a3a9f 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/StatementParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/StatementParser.cs
@@ -7,7 +7,7 @@ using System;
 using System.Collections.Generic;
 using System.Globalization;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Parses stytement type ShowPlan XML nodes
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanHierarchyParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanHierarchyParser.cs
similarity index 97%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanHierarchyParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanHierarchyParser.cs
index 91c4d4d5..69760c3d 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanHierarchyParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanHierarchyParser.cs
@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     internal class XmlPlanHierarchyParser : XmlPlanParser
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanNodeBuilder.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanNodeBuilder.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanNodeBuilder.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanNodeBuilder.cs
index 55f43667..bb7c9dae 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanNodeBuilder.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanNodeBuilder.cs
@@ -13,7 +13,7 @@ using System.Text;
 using System.Xml.Serialization;
 using System.Reflection;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Builds hierarchy of Graph objects from ShowPlan XML
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParser.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParser.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParser.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParser.cs
index 7c34ecf4..697045ba 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParser.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParser.cs
@@ -9,7 +9,7 @@ using System.Collections.Generic;
 using System.ComponentModel;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Class for enumerating FunctionType objects
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParserFactory.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParserFactory.cs
similarity index 96%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParserFactory.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParserFactory.cs
index 7c5d7b2d..e940cf67 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/XmlPlanParserFactory.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/XmlPlanParserFactory.cs
@@ -5,7 +5,7 @@
 
 using System;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     internal static class XmlPlanParserFactory
     {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/nodebuilderconstants.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/nodebuilderconstants.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/nodebuilderconstants.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/nodebuilderconstants.cs
index 6eecced4..c50a5459 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/nodebuilderconstants.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/nodebuilderconstants.cs
@@ -3,7 +3,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 //
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// A class that lists String constants common to XML Show Plan Node Parsing
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplangraph.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplangraph.cs
similarity index 98%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplangraph.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplangraph.cs
index 94227fbf..57cd7b75 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplangraph.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplangraph.cs
@@ -6,7 +6,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan
 {
     /// <summary>
     /// Extension of graph with some handy included methods specific for ShowPlan use
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplanxml.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplanxml.cs
similarity index 99%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplanxml.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplanxml.cs
index e8d4427d..243336d3 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplanxml.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplanxml.cs
@@ -16,7 +16,7 @@
 // 
 // This source code was auto-generated by xsd, Version=4.8.3928.0.
 // 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph {
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan {
     using System.Xml.Serialization;
     
     
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplanxml.xsd b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplanxml.xsd
similarity index 100%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraph/showplanxml.xsd
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlan/showplanxml.xsd
diff --git a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraphUtils.cs b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlanGraphUtils.cs
similarity index 94%
rename from src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraphUtils.cs
rename to src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlanGraphUtils.cs
index 8a8ea687..d2b183b8 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/ShowPlan/ShowPlanGraphUtils.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/ExecutionPlan/ShowPlanGraphUtils.cs
@@ -7,17 +7,17 @@ using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Linq;
-using Microsoft.SqlTools.ServiceLayer.ShowPlan.ShowPlanGraph;
+using Microsoft.SqlTools.ServiceLayer.ExecutionPlan.ShowPlan;
 using Microsoft.SqlTools.Utility;
 using System.Diagnostics;
 
-namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
+namespace Microsoft.SqlTools.ServiceLayer.ExecutionPlan
 {
     public class ShowPlanGraphUtils
     {
         public static List<ExecutionPlanGraph> CreateShowPlanGraph(string xml, string fileName)
         {
-            ShowPlanGraph.ShowPlanGraph[] graphs = ShowPlanGraph.ShowPlanGraph.ParseShowPlanXML(xml, ShowPlanGraph.ShowPlanType.Unknown);
+            ShowPlan.ShowPlanGraph[] graphs = ShowPlan.ShowPlanGraph.ParseShowPlanXML(xml, ShowPlan.ShowPlanType.Unknown);
             return graphs.Select(g => new ExecutionPlanGraph
             {
                 Root = ConvertShowPlanTreeToExecutionPlanTree(g.Root),
@@ -96,7 +96,7 @@ namespace Microsoft.SqlTools.ServiceLayer.ShowPlan
             return propsList;
         }
 
-        private static List<ExecutionPlanRecommendation> ParseRecommendations(ShowPlanGraph.ShowPlanGraph g, string fileName)
+        private static List<ExecutionPlanRecommendation> ParseRecommendations(ShowPlan.ShowPlanGraph g, string fileName)
         {
             return g.Description.MissingIndices.Select(mi => new ExecutionPlanRecommendation
             {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs b/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs
index e1cb2705..9e3286ca 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/HostLoader.cs
@@ -166,8 +166,8 @@ namespace Microsoft.SqlTools.ServiceLayer
             InitializeHostedServices(serviceProvider, serviceHost);
             serviceHost.ServiceProvider = serviceProvider;
 
-            ShowPlan.ExecutionPlanService.Instance.InitializeService(serviceHost);
-            serviceProvider.RegisterSingleService(ShowPlan.ExecutionPlanService.Instance);
+            ExecutionPlan.ExecutionPlanService.Instance.InitializeService(serviceHost);
+            serviceProvider.RegisterSingleService(ExecutionPlan.ExecutionPlanService.Instance);
 
             serviceHost.InitializeRequestHandlers();
         }
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
index ddfc61d5..ca91f0f4 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Batch.cs
@@ -572,7 +572,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
         /// </summary>
         /// <param name="resultSetIndex">The index for selecting the result set</param>
         /// <returns>An execution plan object</returns>
-        public Task<ExecutionPlan> GetExecutionPlan(int resultSetIndex)
+        public Task<Contracts.ExecutionPlan> GetExecutionPlan(int resultSetIndex)
         {
             ResultSet targetResultSet;
             lock (resultSets)
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs
index d0909999..fa646582 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Contracts/ExecuteRequests/ResultSetEvents.cs
@@ -5,7 +5,7 @@
 
 using System.Collections.Generic;
 using Microsoft.SqlTools.Hosting.Protocol.Contracts;
-using Microsoft.SqlTools.ServiceLayer.ShowPlan;
+using Microsoft.SqlTools.ServiceLayer.ExecutionPlan;
 
 namespace Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests
 {
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs
index b803e941..03dd66bf 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/Query.cs
@@ -353,7 +353,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
         /// <param name="batchIndex">The index for selecting the batch item</param>
         /// <param name="resultSetIndex">The index for selecting the result set</param>
         /// <returns>The Execution Plan, if the result set has one</returns>
-        public Task<ExecutionPlan> GetExecutionPlan(int batchIndex, int resultSetIndex)
+        public Task<Contracts.ExecutionPlan> GetExecutionPlan(int batchIndex, int resultSetIndex)
         {
             // Sanity check to make sure that the batch is within bounds
             if (batchIndex < 0 || batchIndex >= Batches.Length)
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs
index b9b06a93..aa42c5b0 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/QueryExecutionService.cs
@@ -16,7 +16,7 @@ using Microsoft.SqlTools.ServiceLayer.Hosting;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts.ExecuteRequests;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.Contracts;
 using Microsoft.SqlTools.ServiceLayer.QueryExecution.DataStorage;
-using Microsoft.SqlTools.ServiceLayer.ShowPlan;
+using Microsoft.SqlTools.ServiceLayer.ExecutionPlan;
 using Microsoft.SqlTools.ServiceLayer.SqlContext;
 using Microsoft.SqlTools.ServiceLayer.Workspace.Contracts;
 using Microsoft.SqlTools.ServiceLayer.Workspace;
diff --git a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs
index 867e6fa8..cfdc2356 100644
--- a/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs
+++ b/src/Microsoft.SqlTools.ServiceLayer/QueryExecution/ResultSet.cs
@@ -309,7 +309,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
         /// Generates the execution plan from the table returned 
         /// </summary>
         /// <returns>An execution plan object</returns>
-        public Task<ExecutionPlan> GetExecutionPlan()
+        public Task<Contracts.ExecutionPlan> GetExecutionPlan()
         {
             // Process the action just in case it hasn't been yet 
             ProcessSpecialAction();
@@ -342,7 +342,7 @@ namespace Microsoft.SqlTools.ServiceLayer.QueryExecution
                     }
                 }
                     
-                return new ExecutionPlan
+                return new Contracts.ExecutionPlan
                 {
                     Format = format,
                     Content = content
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
index 10637393..28c1932f 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/Microsoft.SqlTools.ServiceLayer.UnitTests.csproj
@@ -31,10 +31,9 @@
 	</ItemGroup>
 	<ItemGroup>
 		<Content Remove=".\ShowPlan\TestExecution.xml" />
-		<EmbeddedResource Include=".\ShowPlan\TestExecutionPlan.xml" />
+		<EmbeddedResource Include="ShowPlan\TestShowPlan.xml" />
 	</ItemGroup>
 	<ItemGroup>
-		<Content Remove=".\ShowPlan\TestExecutionPlanRecommendations.xml" />
-		<EmbeddedResource Include=".\ShowPlan\TestExecutionPlanRecommendations.xml" />
+		<EmbeddedResource Include="ShowPlan\TestShowPlanRecommendations.xml" />
 	</ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
index 974ab442..3ec0f6bb 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/QueryExecution/ExecutionPlanTests.cs
@@ -30,7 +30,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution
             // If:
             // ... I have a result set and I ask for a valid execution plan
             ResultSet planResultSet = b.ResultSets.First();
-            ExecutionPlan plan = planResultSet.GetExecutionPlan().Result;
+            ServiceLayer.QueryExecution.Contracts.ExecutionPlan plan = planResultSet.GetExecutionPlan().Result;
             Assert.AreEqual("xml", plan.Format);
             Assert.That(plan.Content, Does.Contain("Execution Plan"), "I should get the execution plan back");
         }
@@ -62,7 +62,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.QueryExecution
             Batch b = Common.GetExecutedBatchWithExecutionPlan();
 
             // ... And I ask for a valid execution plan 
-            ExecutionPlan plan = b.GetExecutionPlan(0).Result;
+            ServiceLayer.QueryExecution.Contracts.ExecutionPlan plan = b.GetExecutionPlan(0).Result;
 
             Assert.AreEqual("xml", plan.Format);
             Assert.That(plan.Content, Does.Contain("Execution Plan"), "I should get the execution plan back");
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/ShowPlanTests.cs b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/ShowPlanTests.cs
index 39c9f18b..c40399e9 100644
--- a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/ShowPlanTests.cs
+++ b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/ShowPlanTests.cs
@@ -4,16 +4,11 @@
 //
 
 using System;
-//
-// Copyright (c) Microsoft. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-//
-
 using System.Collections.Generic;
 using System.IO;
 using System.Reflection;
 using NUnit.Framework;
-using Microsoft.SqlTools.ServiceLayer.ShowPlan;
+using Microsoft.SqlTools.ServiceLayer.ExecutionPlan;
 
 
 namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ShowPlan
@@ -25,7 +20,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ShowPlan
         [Test]
         public void ParseXMLFileReturnsValidShowPlanGraph()
         {
-            ReadFile(".ShowPlan.TestExecutionPlan.xml");
+            ReadFile(".ShowPlan.TestShowPlan.xml");
             var showPlanGraphs = ShowPlanGraphUtils.CreateShowPlanGraph(queryPlanFileText, "testFile.sql");
             Assert.AreEqual(1, showPlanGraphs.Count, "exactly one show plan graph should be returned");
             Assert.NotNull(showPlanGraphs[0], "graph should not be null");
@@ -35,7 +30,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ShowPlan
         [Test]
         public void ParsingNestedProperties()
         {
-            ReadFile(".ShowPlan.TestExecutionPlan.xml");
+            ReadFile(".ShowPlan.TestShowPlan.xml");
             string[] commonNestedPropertiesNames = { "MemoryGrantInfo", "OptimizerHardwareDependentProperties" };
             var showPlanGraphs = ShowPlanGraphUtils.CreateShowPlanGraph(queryPlanFileText, "testFile.sql");
             ExecutionPlanNode rootNode = showPlanGraphs[0].Root;
@@ -52,7 +47,7 @@ namespace Microsoft.SqlTools.ServiceLayer.UnitTests.ShowPlan
         public void ParseXMLFileWithRecommendations()
         {
             //The first graph in this execution plan has 3 recommendations
-            ReadFile(".ShowPlan.TestExecutionPlanRecommendations.xml");
+            ReadFile(".ShowPlan.TestShowPlanRecommendations.xml");
             string[] commonNestedPropertiesNames = { "MemoryGrantInfo", "OptimizerHardwareDependentProperties" };
             var showPlanGraphs = ShowPlanGraphUtils.CreateShowPlanGraph(queryPlanFileText, "testFile.sql");
             List<ExecutionPlanRecommendation> rootNode = showPlanGraphs[0].Recommendations;
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestExecutionPlan.xml b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestShowPlan.xml
similarity index 100%
rename from test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestExecutionPlan.xml
rename to test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestShowPlan.xml
diff --git a/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestExecutionPlanRecommendations.xml b/test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestShowPlanRecommendations.xml
similarity index 100%
rename from test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestExecutionPlanRecommendations.xml
rename to test/Microsoft.SqlTools.ServiceLayer.UnitTests/ShowPlan/TestShowPlanRecommendations.xml