diff --git a/.gitignore b/.gitignore
index 57a1574..be54d1b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -194,3 +194,4 @@ FakesAssemblies/
 
 # Visual Studio 6 workspace options file
 *.opt
+*.jfm
\ No newline at end of file
diff --git a/src/SSDTDevPack.Clippy/ClippyGlyphFactory.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyGlyphFactory.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyGlyphFactory.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyGlyphFactory.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyGlyphFactoryProvider.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyGlyphFactoryProvider.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyGlyphFactoryProvider.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyGlyphFactoryProvider.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyOperation.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyReplacementOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyReplacementOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyReplacementOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyReplacementOperation.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyReplacementOperations.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyReplacementOperations.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyReplacementOperations.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyReplacementOperations.cs
diff --git a/src/SSDTDevPack.Clippy/ClippySettings.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippySettings.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippySettings.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippySettings.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyTag.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyTag.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyTag.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyTag.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyTagger.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyTagger.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyTagger.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyTagger.cs
diff --git a/src/SSDTDevPack.Clippy/ClippyTaggerProvider.cs b/src/Common/src/SSDTDevPack.Common/Clippy/ClippyTaggerProvider.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/ClippyTaggerProvider.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/ClippyTaggerProvider.cs
diff --git a/src/SSDTDevPack.Clippy/MainWindow.xaml b/src/Common/src/SSDTDevPack.Common/Clippy/MainWindow.xaml
similarity index 100%
rename from src/SSDTDevPack.Clippy/MainWindow.xaml
rename to src/Common/src/SSDTDevPack.Common/Clippy/MainWindow.xaml
diff --git a/src/SSDTDevPack.Clippy/MainWindow.xaml.cs b/src/Common/src/SSDTDevPack.Common/Clippy/MainWindow.xaml.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/MainWindow.xaml.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/MainWindow.xaml.cs
diff --git a/src/SSDTDevPack.Clippy/MenuItem.xaml b/src/Common/src/SSDTDevPack.Common/Clippy/MenuItem.xaml
similarity index 100%
rename from src/SSDTDevPack.Clippy/MenuItem.xaml
rename to src/Common/src/SSDTDevPack.Common/Clippy/MenuItem.xaml
diff --git a/src/SSDTDevPack.Clippy/MenuItem.xaml.cs b/src/Common/src/SSDTDevPack.Common/Clippy/MenuItem.xaml.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/MenuItem.xaml.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/MenuItem.xaml.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/ClippyOperationBuilder.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/ClippyOperationBuilder.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/ClippyOperationBuilder.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/ClippyOperationBuilder.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/DeleteChunkerOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/DeleteChunkerOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/DeleteChunkerOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/DeleteChunkerOperation.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/InequalityReWriteOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/InequalityReWriteOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/InequalityReWriteOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/InequalityReWriteOperation.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/IsNullReWriteOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/IsNullReWriteOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/IsNullReWriteOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/IsNullReWriteOperation.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/OrdinalOrderByReWriteOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/OrdinalOrderByReWriteOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/OrdinalOrderByReWriteOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/OrdinalOrderByReWriteOperation.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/QueryCostOperations.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/QueryCostOperations.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/QueryCostOperations.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/QueryCostOperations.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/ReWriterOperation.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/ReWriterOperation.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/ReWriterOperation.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/ReWriterOperation.cs
diff --git a/src/SSDTDevPack.Clippy/Operations/TableNameCorrectCaser.cs b/src/Common/src/SSDTDevPack.Common/Clippy/Operations/TableNameCorrectCaser.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/Operations/TableNameCorrectCaser.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/Operations/TableNameCorrectCaser.cs
diff --git a/src/SSDTDevPack.Clippy/OperationsBuilder.cs b/src/Common/src/SSDTDevPack.Common/Clippy/OperationsBuilder.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/OperationsBuilder.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/OperationsBuilder.cs
diff --git a/src/SSDTDevPack.Clippy/TagStore.cs b/src/Common/src/SSDTDevPack.Common/Clippy/TagStore.cs
similarity index 100%
rename from src/SSDTDevPack.Clippy/TagStore.cs
rename to src/Common/src/SSDTDevPack.Common/Clippy/TagStore.cs
diff --git a/src/SSDTDevPack.CCover/CodeCoverageMap.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/CodeCoverageMap.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/CodeCoverageMap.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/CodeCoverageMap.cs
diff --git a/src/SSDTDevPack.CCover/CodeCoverageStore.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/CodeCoverageStore.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/CodeCoverageStore.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/CodeCoverageStore.cs
diff --git a/src/SSDTDevPack.CCover/CoveredStatement.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/CoveredStatement.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/CoveredStatement.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/CoveredStatement.cs
diff --git a/src/SSDTDevPack.CCover/DatabaseGateway.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/DatabaseGateway.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/DatabaseGateway.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/DatabaseGateway.cs
diff --git a/src/SSDTDevPack.CCover/ExtendedEventDataDataReader.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/ExtendedEventDataDataReader.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/ExtendedEventDataDataReader.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/ExtendedEventDataDataReader.cs
diff --git a/src/SSDTDevPack.CCover/Ui/CodeCoverageWindow.xaml b/src/Common/src/SSDTDevPack.Common/CodeCOverage/Ui/CodeCoverageWindow.xaml
similarity index 100%
rename from src/SSDTDevPack.CCover/Ui/CodeCoverageWindow.xaml
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/Ui/CodeCoverageWindow.xaml
diff --git a/src/SSDTDevPack.CCover/Ui/CodeCoverageWindow.xaml.cs b/src/Common/src/SSDTDevPack.Common/CodeCOverage/Ui/CodeCoverageWindow.xaml.cs
similarity index 100%
rename from src/SSDTDevPack.CCover/Ui/CodeCoverageWindow.xaml.cs
rename to src/Common/src/SSDTDevPack.Common/CodeCOverage/Ui/CodeCoverageWindow.xaml.cs
diff --git a/src/SSDTDevPack.Extraction/CodeExtractor.cs b/src/Common/src/SSDTDevPack.Common/CodeExtractor.cs
similarity index 100%
rename from src/SSDTDevPack.Extraction/CodeExtractor.cs
rename to src/Common/src/SSDTDevPack.Common/CodeExtractor.cs
diff --git a/src/NameConstraints/src/SSDTDevPack.NameConstraints/ConstraintNamer.cs b/src/Common/src/SSDTDevPack.Common/ConstraintNamer.cs
similarity index 100%
rename from src/NameConstraints/src/SSDTDevPack.NameConstraints/ConstraintNamer.cs
rename to src/Common/src/SSDTDevPack.Common/ConstraintNamer.cs
diff --git a/src/SSDTDevPack.Formatting/KeywordCaser.cs b/src/Common/src/SSDTDevPack.Common/KeywordCaser.cs
similarity index 100%
rename from src/SSDTDevPack.Formatting/KeywordCaser.cs
rename to src/Common/src/SSDTDevPack.Common/KeywordCaser.cs
diff --git a/src/Common/src/SSDTDevPack.Logging/Log.cs b/src/Common/src/SSDTDevPack.Common/Log.cs
similarity index 100%
rename from src/Common/src/SSDTDevPack.Logging/Log.cs
rename to src/Common/src/SSDTDevPack.Common/Log.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/069085-black-paint-splatter-icon-alphanumeric-letter-m.png b/src/Common/src/SSDTDevPack.Common/Merge/069085-black-paint-splatter-icon-alphanumeric-letter-m.png
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/069085-black-paint-splatter-icon-alphanumeric-letter-m.png
rename to src/Common/src/SSDTDevPack.Common/Merge/069085-black-paint-splatter-icon-alphanumeric-letter-m.png
diff --git a/src/Merge/src/SSDTDevPack.Merge/MergeDescriptor/Merge.cs b/src/Common/src/SSDTDevPack.Common/Merge/MergeDescriptor/Merge.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/MergeDescriptor/Merge.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/MergeDescriptor/Merge.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/MergeDescriptor/MergeOptions.cs b/src/Common/src/SSDTDevPack.Common/Merge/MergeDescriptor/MergeOptions.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/MergeDescriptor/MergeOptions.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/MergeDescriptor/MergeOptions.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementFactory.cs b/src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementFactory.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementFactory.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementFactory.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementParser.cs b/src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementParser.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementParser.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementParser.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementRepository.cs b/src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementRepository.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/Parsing/MergeStatementRepository.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/Parsing/MergeStatementRepository.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.Designer.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.Designer.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.Designer.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.Designer.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.resx b/src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.resx
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/AddTableDialog.resx
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/AddTableDialog.resx
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.Designer.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.Designer.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.Designer.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.Designer.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.resx b/src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.resx
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ConnectDialog.resx
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ConnectDialog.resx
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.Designer.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.Designer.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.Designer.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.Designer.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.resx b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.resx
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportMultipleTablesDialog.resx
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportMultipleTablesDialog.resx
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.Designer.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.Designer.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.Designer.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.Designer.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.resx b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.resx
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportOverwriteTable.resx
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportOverwriteTable.resx
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.Designer.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.Designer.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.Designer.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.Designer.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.resx b/src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.resx
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/ImportSingleTableDialog.resx
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/ImportSingleTableDialog.resx
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/MainWindow.xaml b/src/Common/src/SSDTDevPack.Common/Merge/UI/MainWindow.xaml
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/MainWindow.xaml
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/MainWindow.xaml
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/MainWindow.xaml.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/MainWindow.xaml.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/MainWindow.xaml.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/MainWindow.xaml.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/TablePage.xaml b/src/Common/src/SSDTDevPack.Common/Merge/UI/TablePage.xaml
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/TablePage.xaml
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/TablePage.xaml
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/TablePage.xaml.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/TablePage.xaml.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/TablePage.xaml.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/TablePage.xaml.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/UIProperties.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/UIProperties.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/UIProperties.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/UIProperties.cs
diff --git a/src/Merge/src/SSDTDevPack.Merge/UI/UiSettings.cs b/src/Common/src/SSDTDevPack.Common/Merge/UI/UiSettings.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Merge/UI/UiSettings.cs
rename to src/Common/src/SSDTDevPack.Common/Merge/UI/UiSettings.cs
diff --git a/src/SSDTDevPack.QueryCosts/DocumentScriptCosters.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/DocumentScriptCosters.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/DocumentScriptCosters.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/DocumentScriptCosters.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordFormatDefinition.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordFormatDefinition.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordFormatDefinition.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordFormatDefinition.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTag.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTag.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTag.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTag.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTagger.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTagger.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTagger.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTagger.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTaggerProvider.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTaggerProvider.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/HighlightWordTaggerProvider.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/HighlightWordTaggerProvider.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/LowlightWordFormatDefinition.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/LowlightWordFormatDefinition.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/LowlightWordFormatDefinition.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/LowlightWordFormatDefinition.cs
diff --git a/src/SSDTDevPack.QueryCosts/Highlighter/LowlightWordTag.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/LowlightWordTag.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/Highlighter/LowlightWordTag.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/Highlighter/LowlightWordTag.cs
diff --git a/src/SSDTDevPack.QueryCosts/QueryCostRepository.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/QueryCostRepository.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/QueryCostRepository.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/QueryCostRepository.cs
diff --git a/src/SSDTDevPack.QueryCosts/ScriptCoster.cs b/src/Common/src/SSDTDevPack.Common/QueryCosts/ScriptCoster.cs
similarity index 100%
rename from src/SSDTDevPack.QueryCosts/ScriptCoster.cs
rename to src/Common/src/SSDTDevPack.Common/QueryCosts/ScriptCoster.cs
diff --git a/src/SSDTDevPack.QuickDeploy/QuickDeployer.cs b/src/Common/src/SSDTDevPack.Common/QuickDeploy/QuickDeployer.cs
similarity index 100%
rename from src/SSDTDevPack.QuickDeploy/QuickDeployer.cs
rename to src/Common/src/SSDTDevPack.Common/QuickDeploy/QuickDeployer.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/ChunkDeletesRewriter.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/ChunkDeletesRewriter.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/ChunkDeletesRewriter.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/ChunkDeletesRewriter.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/DuplicateIndexFinder.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/DuplicateIndexFinder.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/DuplicateIndexFinder.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/DuplicateIndexFinder.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/NonSargableRewrites.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/NonSargableRewrites.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/NonSargableRewrites.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/NonSargableRewrites.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/OrderByOrdinalRewrites.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/OrderByOrdinalRewrites.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/OrderByOrdinalRewrites.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/OrderByOrdinalRewrites.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/Replacements.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/Replacements.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/Replacements.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/Replacements.cs
diff --git a/src/Merge/src/SSDTDevPack.Indexes/TableReferenceRewriter.cs b/src/Common/src/SSDTDevPack.Common/Rewriter/TableReferenceRewriter.cs
similarity index 100%
rename from src/Merge/src/SSDTDevPack.Indexes/TableReferenceRewriter.cs
rename to src/Common/src/SSDTDevPack.Common/Rewriter/TableReferenceRewriter.cs
diff --git a/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj b/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
index 588c431..db43a16 100644
--- a/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
+++ b/src/Common/src/SSDTDevPack.Common/SSDTDevPack.Common.csproj
@@ -41,14 +41,18 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\Lib\DacFxStronglyTypedModel.dll</HintPath>
     </Reference>
-    <Reference Include="envdte, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
     <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
@@ -56,6 +60,9 @@
     <Reference Include="envdte90a, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
       <EmbedInteropTypes>True</EmbedInteropTypes>
     </Reference>
+    <Reference Include="MahApps.Metro, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\MahApps.Metro.1.6.0-alpha001\lib\net45\MahApps.Metro.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Data.Tools.Components, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Components.dll</HintPath>
     </Reference>
@@ -93,22 +100,35 @@
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0, Version=11.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <EmbedInteropTypes>True</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Text.Data.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.Data.dll</HintPath>
       <Private>True</Private>
@@ -125,20 +145,45 @@
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Text.UI.Wpf.15.0.26201\lib\net45\Microsoft.VisualStudio.Text.UI.Wpf.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\NLog.5.0.0-beta07\lib\net45\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
+    <Reference Include="stdole, Version=7.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\stdole.7.0.3301\lib\net10\stdole.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.Composition" />
+    <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Windows.Interactivity, Version=4.5.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\MahApps.Metro.1.6.0-alpha001\lib\net45\System.Windows.Interactivity.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xaml" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -150,6 +195,40 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Clippy\ClippyGlyphFactory.cs" />
+    <Compile Include="Clippy\ClippyGlyphFactoryProvider.cs" />
+    <Compile Include="Clippy\ClippyOperation.cs" />
+    <Compile Include="Clippy\ClippyReplacementOperation.cs" />
+    <Compile Include="Clippy\ClippyReplacementOperations.cs" />
+    <Compile Include="Clippy\ClippySettings.cs" />
+    <Compile Include="Clippy\ClippyTag.cs" />
+    <Compile Include="Clippy\ClippyTagger.cs" />
+    <Compile Include="Clippy\ClippyTaggerProvider.cs" />
+    <Compile Include="Clippy\MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Clippy\MenuItem.xaml.cs">
+      <DependentUpon>MenuItem.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Clippy\OperationsBuilder.cs" />
+    <Compile Include="Clippy\Operations\ClippyOperationBuilder.cs" />
+    <Compile Include="Clippy\Operations\DeleteChunkerOperation.cs" />
+    <Compile Include="Clippy\Operations\InequalityReWriteOperation.cs" />
+    <Compile Include="Clippy\Operations\IsNullReWriteOperation.cs" />
+    <Compile Include="Clippy\Operations\OrdinalOrderByReWriteOperation.cs" />
+    <Compile Include="Clippy\Operations\QueryCostOperations.cs" />
+    <Compile Include="Clippy\Operations\ReWriterOperation.cs" />
+    <Compile Include="Clippy\Operations\TableNameCorrectCaser.cs" />
+    <Compile Include="Clippy\TagStore.cs" />
+    <Compile Include="CodeCOverage\CodeCoverageMap.cs" />
+    <Compile Include="CodeCOverage\CodeCoverageStore.cs" />
+    <Compile Include="CodeCOverage\CoveredStatement.cs" />
+    <Compile Include="CodeCOverage\DatabaseGateway.cs" />
+    <Compile Include="CodeCOverage\ExtendedEventDataDataReader.cs" />
+    <Compile Include="CodeCOverage\Ui\CodeCoverageWindow.xaml.cs">
+      <DependentUpon>CodeCoverageWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="CodeExtractor.cs" />
     <Compile Include="ConnectionDialog\LabelledTextbox.xaml.cs">
       <DependentUpon>LabelledTextbox.xaml</DependentUpon>
     </Compile>
@@ -157,6 +236,7 @@
       <DependentUpon>SqlConnectionDialog.xaml</DependentUpon>
     </Compile>
     <Compile Include="ConnectionDialog\WatermarkService.cs" />
+    <Compile Include="ConstraintNamer.cs" />
     <Compile Include="Dac\ColumnDescriptor.cs" />
     <Compile Include="Dac\DacpacPath.cs" />
     <Compile Include="Dac\LiteralConverter.cs" />
@@ -169,10 +249,71 @@
     <Compile Include="Enumerators\ProjectItemEnumerator.cs" />
     <Compile Include="Enumerators\ProjectType.cs" />
     <Compile Include="Enumerators\StatementEnumerator.cs" />
+    <Compile Include="KeywordCaser.cs" />
+    <Compile Include="Log.cs" />
+    <Compile Include="Merge\MergeDescriptor\Merge.cs" />
+    <Compile Include="Merge\MergeDescriptor\MergeOptions.cs" />
+    <Compile Include="Merge\Parsing\MergeStatementFactory.cs" />
+    <Compile Include="Merge\Parsing\MergeStatementParser.cs" />
+    <Compile Include="Merge\Parsing\MergeStatementRepository.cs" />
+    <Compile Include="Merge\UI\AddTableDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Merge\UI\AddTableDialog.Designer.cs">
+      <DependentUpon>AddTableDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\ConnectDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Merge\UI\ConnectDialog.Designer.cs">
+      <DependentUpon>ConnectDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\ImportMultipleTablesDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Merge\UI\ImportMultipleTablesDialog.Designer.cs">
+      <DependentUpon>ImportMultipleTablesDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\ImportOverwriteTable.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Merge\UI\ImportOverwriteTable.Designer.cs">
+      <DependentUpon>ImportOverwriteTable.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\ImportSingleTableDialog.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="Merge\UI\ImportSingleTableDialog.Designer.cs">
+      <DependentUpon>ImportSingleTableDialog.cs</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\TablePage.xaml.cs">
+      <DependentUpon>TablePage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Merge\UI\UIProperties.cs" />
+    <Compile Include="Merge\UI\UiSettings.cs" />
     <Compile Include="ProjectItems\Extensions.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ProjectItems\ScriptDom\Quote.cs" />
     <Compile Include="ProjectItems\ScriptDom\ScriptParser.cs" />
+    <Compile Include="QueryCosts\DocumentScriptCosters.cs" />
+    <Compile Include="QueryCosts\Highlighter\HighlightWordFormatDefinition.cs" />
+    <Compile Include="QueryCosts\Highlighter\HighlightWordTag.cs" />
+    <Compile Include="QueryCosts\Highlighter\HighlightWordTagger.cs" />
+    <Compile Include="QueryCosts\Highlighter\HighlightWordTaggerProvider.cs" />
+    <Compile Include="QueryCosts\Highlighter\LowlightWordFormatDefinition.cs" />
+    <Compile Include="QueryCosts\Highlighter\LowlightWordTag.cs" />
+    <Compile Include="QueryCosts\QueryCostRepository.cs" />
+    <Compile Include="QueryCosts\ScriptCoster.cs" />
+    <Compile Include="QuickDeploy\QuickDeployer.cs" />
+    <Compile Include="Rewriter\ChunkDeletesRewriter.cs" />
+    <Compile Include="Rewriter\DuplicateIndexFinder.cs" />
+    <Compile Include="Rewriter\NonSargableRewrites.cs" />
+    <Compile Include="Rewriter\OrderByOrdinalRewrites.cs" />
+    <Compile Include="Rewriter\Replacements.cs" />
+    <Compile Include="Rewriter\TableReferenceRewriter.cs" />
     <Compile Include="ScriptDom\ProcedureVisitor.cs" />
     <Compile Include="Settings\SavedSettings.cs" />
     <Compile Include="SolutionBrowser\SolutionBrowser.cs" />
@@ -185,6 +326,13 @@
     <Compile Include="SolutionBrowser\wpfSolutionBrowser.xaml.cs">
       <DependentUpon>wpfSolutionBrowser.xaml</DependentUpon>
     </Compile>
+    <Compile Include="tSQLtStubber\Parameter.cs" />
+    <Compile Include="tSQLtStubber\ParametersHelper.cs" />
+    <Compile Include="tSQLtStubber\ProcedureBuilder.cs" />
+    <Compile Include="tSQLtStubber\ProcedureVisitor.cs" />
+    <Compile Include="tSQLtStubber\SchemaBuilder.cs" />
+    <Compile Include="tSQLtStubber\ScriptBuilder.cs" />
+    <Compile Include="tSQLtStubber\TestBuilder.cs" />
     <Compile Include="Ui\LabelWithProgressIndicator.xaml.cs">
       <DependentUpon>LabelWithProgressIndicator.xaml</DependentUpon>
     </Compile>
@@ -199,12 +347,18 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SSDTDevPack.Logging\SSDTDevPack.Logging.csproj">
-      <Project>{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}</Project>
-      <Name>SSDTDevPack.Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
+    <Page Include="Clippy\MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Clippy\MenuItem.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="CodeCOverage\Ui\CodeCoverageWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="ConnectionDialog\LabelledTextbox.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -213,6 +367,14 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Merge\UI\MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Page Include="Merge\UI\TablePage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="SolutionBrowser\wpfSolutionBrowser.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -223,6 +385,21 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="Merge\UI\AddTableDialog.resx">
+      <DependentUpon>AddTableDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Merge\UI\ConnectDialog.resx">
+      <DependentUpon>ConnectDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Merge\UI\ImportMultipleTablesDialog.resx">
+      <DependentUpon>ImportMultipleTablesDialog.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Merge\UI\ImportOverwriteTable.resx">
+      <DependentUpon>ImportOverwriteTable.cs</DependentUpon>
+    </EmbeddedResource>
+    <EmbeddedResource Include="Merge\UI\ImportSingleTableDialog.resx">
+      <DependentUpon>ImportSingleTableDialog.cs</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="SolutionBrowser\SolutionBrowserForm.resx">
       <DependentUpon>SolutionBrowserForm.cs</DependentUpon>
     </EmbeddedResource>
@@ -230,6 +407,9 @@
   <ItemGroup>
     <Folder Include="TextHighlighter\" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Merge\069085-black-paint-splatter-icon-alphanumeric-letter-m.png" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Common/src/SSDTDevPack.Common/packages.config b/src/Common/src/SSDTDevPack.Common/packages.config
index 20604ef..acedcae 100644
--- a/src/Common/src/SSDTDevPack.Common/packages.config
+++ b/src/Common/src/SSDTDevPack.Common/packages.config
@@ -1,9 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
+  <package id="EnvDTE" version="8.0.1" targetFramework="net46" />
+  <package id="EnvDTE80" version="8.0.1" targetFramework="net46" />
+  <package id="MahApps.Metro" version="1.6.0-alpha001" targetFramework="net46" />
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.Text.Data" version="15.0.26201" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Text.Logic" version="15.0.26201" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Text.UI" version="15.0.26201" targetFramework="net45" />
   <package id="Microsoft.VisualStudio.Text.UI.Wpf" version="15.0.26201" targetFramework="net45" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
+  <package id="NLog" version="5.0.0-beta07" targetFramework="net46" />
+  <package id="stdole" version="7.0.3301" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/Parameter.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/Parameter.cs
new file mode 100644
index 0000000..1caef53
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/Parameter.cs
@@ -0,0 +1,16 @@
+using Microsoft.SqlServer.Dac.Model;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class Parameter
+    {
+        public string Name;
+        public SqlDataType Type;
+
+        public Parameter(string name, SqlDataType type)
+        {
+            Name = name;
+            Type = type;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ParametersHelper.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ParametersHelper.cs
new file mode 100644
index 0000000..f3f2a8a
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ParametersHelper.cs
@@ -0,0 +1,53 @@
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class ParametersHelper
+    {
+        public static ExecuteParameter CreateStoredProcedureParameter(string name, string value)
+        {
+            return new ExecuteParameter
+            {
+                Variable = new VariableReference
+                {
+                    Name = name
+                },
+                ParameterValue = new StringLiteral {Value = value}
+            };
+        }
+
+        public static ExecuteParameter CreateStoredProcedureParameter(string name, int value)
+        {
+            return new ExecuteParameter
+            {
+                Variable = new VariableReference
+                {
+                    Name = name
+                },
+                ParameterValue = new IntegerLiteral {Value = value.ToString()}
+            };
+        }
+
+        public static ExecuteParameter CreateStoredProcedureVariableParameter(string name)
+        {
+            return new ExecuteParameter
+            {
+                ParameterValue = new VariableReference
+                {
+                    Name = name
+                }
+            };
+        }
+
+        public static ExecuteParameter CreateStoredProcedureParameter(string value)
+        {
+            return new ExecuteParameter
+            {
+                ParameterValue = new StringLiteral
+                {
+                    Value = value
+                }
+            };
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureBuilder.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureBuilder.cs
new file mode 100644
index 0000000..d531e24
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureBuilder.cs
@@ -0,0 +1,431 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.SqlServer.Dac.Extensions.Prototype;
+using Microsoft.SqlServer.Dac.Model;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+using SSDTDevPack.Common.Dac;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    enum CodeType
+    {
+        Procedure,
+        Function
+    }
+    //TODO I added function in a hurry, this should be split into two classes which inherit common code
+    public class ProcedureBuilder : ScriptBuilder
+    {
+        private readonly ExecuteStatement _execProc = new ExecuteStatement();
+        private readonly SelectStatement _functionSelect = new SelectStatement();
+        private readonly List<Parameter> _parameters = new List<Parameter>();
+        private readonly List<ObjectIdentifier> _tables = new List<ObjectIdentifier>();
+        private readonly CreateProcedureStatement _testProcedure = new CreateProcedureStatement();
+        private readonly CodeType CodeType;
+
+        public ProcedureBuilder(string testSchema, string testName, TSqlProcedure procedureUnderTest)
+        {
+            CodeType = CodeType.Procedure;
+            _testProcedure.StatementList = new StatementList();
+            foreach (var t in procedureUnderTest.BodyDependencies)
+            {
+                if (t.ObjectType == ModelSchema.Table)
+                {
+                    //table to fake
+                    var table = new TSqlTable(t.Element);
+                    AddTable(table.Name);
+                }
+            }
+
+            foreach (var p in procedureUnderTest.Parameters)
+            {
+                AddParameter(p.Name.GetName().UnQuote(), GetParameterType(p.DataType));
+            }
+
+            CreateTestProcedureDefinition(testSchema, testName);
+            CreateExecForProcUnderTest(procedureUnderTest.Name);
+        }
+
+        public ProcedureBuilder(string testSchema, string testName, TSqlTableValuedFunction procedureUnderTest)
+        {
+            CodeType = CodeType.Function;
+            _testProcedure.StatementList = new StatementList();
+            foreach (var t in procedureUnderTest.BodyDependencies)
+            {
+                if (t.ObjectType == ModelSchema.Table)
+                {
+                    //table to fake
+                    var table = new TSqlTable(t.Element);
+                    AddTable(table.Name);
+                }
+            }
+
+            foreach (var p in procedureUnderTest.Parameters)
+            {
+                AddParameter(p.Name.GetName().UnQuote(), GetParameterType(p.DataType));
+            }
+
+            CreateTestProcedureDefinition(testSchema, testName);
+            CreateSelectForFunctionUnderTest(procedureUnderTest.Name);
+        }
+
+        
+        private SqlDataType GetParameterType(IEnumerable<ISqlDataType> dataType)
+        {
+            foreach (var type in dataType)
+            {
+                SqlDataType returnType;
+                if (Enum.TryParse(type.Name.GetName().UnQuote(), true, out returnType))
+                    return returnType;
+            }
+            
+            return SqlDataType.VarChar;
+        }
+
+        private void CreateTestProcedureDefinition(string testSchema, string testName)
+        {
+            var testProcedureReference = _testProcedure.ProcedureReference = new ProcedureReference();
+            testProcedureReference.Name = new SchemaObjectName();
+            testProcedureReference.Name.Identifiers.Add(testSchema.ToIdentifier());
+            testProcedureReference.Name.Identifiers.Add(testName.ToIdentifier());
+            testProcedureReference.Name.BaseIdentifier.QuoteType = QuoteType.SquareBracket;
+            testProcedureReference.Name.SchemaIdentifier.QuoteType = QuoteType.SquareBracket;
+        }
+
+        private void CreateExecForProcUnderTest(ObjectIdentifier procUnderTest)
+        {
+            var calleeProcedure = new ProcedureReference();
+            calleeProcedure.Name = new SchemaObjectName();
+
+            _execProc.ExecuteSpecification = new ExecuteSpecification();
+            var entity = new ExecutableProcedureReference();
+            entity.ProcedureReference = new ProcedureReferenceName();
+            entity.ProcedureReference.ProcedureReference = calleeProcedure;
+            entity.ProcedureReference.ProcedureReference.Name = procUnderTest.ToSchemaObjectName();
+            _execProc.ExecuteSpecification.ExecutableEntity = entity;
+        }
+
+        private void CreateSelectForFunctionUnderTest(ObjectIdentifier name)
+        {
+            var select = new QuerySpecification();
+            select.SelectElements.Add(new SelectStarExpression());
+
+            var from = new FromClause();
+            var reference = new SchemaObjectFunctionTableReference();
+            foreach (var p in _parameters)
+            {
+                reference.Parameters.Add(new VariableReference(){Name = p.Name});
+            }
+            
+            reference.SchemaObject = name.ToSchemaObjectName();
+            from.TableReferences.Add(reference);
+
+            select.FromClause = from;
+            _functionSelect.QueryExpression = select;
+        }
+
+
+        public void AddParameter(string name, SqlDataType type)
+        {
+            _parameters.Add(new Parameter(name, type));
+        }
+
+        public void AddTable(ObjectIdentifier name)
+        {
+            _tables.Add(name);
+        }
+
+        //We want it to look like, create proc as .. fake tables .. declares for proc .. proc .. assert
+        private void Assemble()
+        {
+            _testProcedure.StatementList.Statements.Clear();
+
+
+            foreach (var table in _tables)
+            {
+                CreateFakeTableDefinition(table);
+            }
+            
+            foreach (var parameter in _parameters)
+            {
+                CreateDeclareVariableDefinitionForParmeter(parameter.Name, parameter.Type);
+
+                if (CodeType == CodeType.Procedure)
+                    CreateParameterForCalleeStoredProc(parameter);
+            }
+            
+            if(CodeType == CodeType.Procedure)
+                _testProcedure.StatementList.Statements.Add(_execProc);
+            else
+                _testProcedure.StatementList.Statements.Add(_functionSelect);
+
+
+            CreateAssertDefinition();
+        }
+
+        private void CreateParameterForCalleeStoredProc(Parameter parameter)
+        {
+            _execProc.ExecuteSpecification.ExecutableEntity.Parameters.Add(
+                ParametersHelper.CreateStoredProcedureVariableParameter(parameter.Name));
+        }
+
+        private void CreateFakeTableDefinition(ObjectIdentifier table)
+        {
+            var fakeTable = new ExecuteStatement();
+            fakeTable.ExecuteSpecification = new ExecuteSpecification();
+
+            var procedureReference = new ProcedureReference();
+            procedureReference.Name = new SchemaObjectName();
+            procedureReference.Name.Identifiers.Add("tSQLt".ToIdentifier());
+            procedureReference.Name.Identifiers.Add("FakeTable".ToIdentifier());
+
+            var entity = new ExecutableProcedureReference();
+            entity.ProcedureReference = new ProcedureReferenceName();
+            entity.ProcedureReference.ProcedureReference = procedureReference;
+
+            entity.Parameters.Add(
+                ParametersHelper.CreateStoredProcedureParameter(string.Format("{0}", table.GetSchema())));
+            entity.Parameters.Add(
+                ParametersHelper.CreateStoredProcedureParameter(string.Format("{0}", table.GetName())));
+
+            fakeTable.ExecuteSpecification.ExecutableEntity = entity;
+
+            _testProcedure.StatementList.Statements.Add(fakeTable);
+        }
+
+        private void CreateAssertDefinition()
+        {
+            var fakeTable = new ExecuteStatement();
+            fakeTable.ExecuteSpecification = new ExecuteSpecification();
+
+            var procedureReference = new ProcedureReference();
+            procedureReference.Name = new SchemaObjectName();
+            procedureReference.Name.Identifiers.Add("tSQLt".ToIdentifier());
+            procedureReference.Name.Identifiers.Add("AssertEquals".ToIdentifier());
+
+            var entity = new ExecutableProcedureReference();
+            entity.ProcedureReference = new ProcedureReferenceName();
+            entity.ProcedureReference.ProcedureReference = procedureReference;
+
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("TRUE"));
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("FALSE"));
+
+            var messageParameter = new ExecuteParameter();
+            var messageValue = new StringLiteral { IsNational = true, Value = "Error Not Implemented" };
+            messageParameter.ParameterValue = messageValue;
+            entity.Parameters.Add(messageParameter);
+
+            fakeTable.ExecuteSpecification.ExecutableEntity = entity;
+
+            _testProcedure.StatementList.Statements.Add(fakeTable);
+        }
+
+        private void CreateDeclareVariableDefinitionForParmeter(string name, SqlDataType type)
+        {
+            var declare = new DeclareVariableStatement();
+            var declareElement = new DeclareVariableElement();
+
+            var dataType = GetDataType(type);
+            declareElement.Value = GetDefaultValue(dataType);
+            declareElement.DataType = dataType;
+            declareElement.VariableName = name.ToIdentifier();
+            declare.Declarations.Add(declareElement);
+
+            _testProcedure.StatementList.Statements.Add(declare);
+        }
+
+        public string GetScript()
+        {
+            Assemble();
+
+            var script = new StringBuilder();
+
+            var tokens = GetTokens(_testProcedure);
+            var previousNewLine = false;
+
+            foreach (var token in tokens)
+            {
+                if (previousNewLine && (token.TokenType != TSqlTokenType.As && token.TokenType != TSqlTokenType.Create))
+                {
+                    script.Append("    ");
+                }
+
+                script.Append(token.Text);
+
+                previousNewLine = token.Text == "\r\n";
+            }
+
+            return script.ToString();
+        }
+
+        private SqlDataTypeReference GetDataType(SqlDataType type)
+        {
+            var option = SqlDataTypeOption.BigInt;
+
+            switch (type)
+            {
+                case SqlDataType.Unknown:
+                    option = SqlDataTypeOption.VarChar;
+                    break;
+                case SqlDataType.BigInt:
+                    option = SqlDataTypeOption.BigInt;
+                    break;
+                case SqlDataType.Int:
+                    option = SqlDataTypeOption.Int;
+                    break;
+                case SqlDataType.SmallInt:
+                    option = SqlDataTypeOption.SmallInt;
+                    break;
+                case SqlDataType.TinyInt:
+                    option = SqlDataTypeOption.TinyInt;
+                    break;
+                case SqlDataType.Bit:
+                    option = SqlDataTypeOption.Bit;
+                    break;
+                case SqlDataType.Decimal:
+                    option = SqlDataTypeOption.Decimal;
+                    break;
+                case SqlDataType.Numeric:
+                    option = SqlDataTypeOption.Numeric;
+                    break;
+                case SqlDataType.Money:
+                    option = SqlDataTypeOption.Money;
+                    break;
+                case SqlDataType.SmallMoney:
+                    option = SqlDataTypeOption.SmallMoney;
+                    break;
+                case SqlDataType.Float:
+                    option = SqlDataTypeOption.Float;
+                    break;
+                case SqlDataType.Real:
+                    option = SqlDataTypeOption.Real;
+                    break;
+                case SqlDataType.DateTime:
+                    option = SqlDataTypeOption.DateTime;
+                    break;
+                case SqlDataType.SmallDateTime:
+                    option = SqlDataTypeOption.SmallDateTime;
+                    break;
+                case SqlDataType.Char:
+                    option = SqlDataTypeOption.Char;
+                    break;
+                case SqlDataType.VarChar:
+                    option = SqlDataTypeOption.VarChar;
+                    break;
+                case SqlDataType.Text:
+                    option = SqlDataTypeOption.Text;
+                    break;
+                case SqlDataType.NChar:
+                    option = SqlDataTypeOption.NChar;
+                    break;
+                case SqlDataType.NVarChar:
+                    option = SqlDataTypeOption.NVarChar;
+                    break;
+                case SqlDataType.NText:
+                    option = SqlDataTypeOption.NText;
+                    break;
+                case SqlDataType.Binary:
+                    option = SqlDataTypeOption.Binary;
+                    break;
+                case SqlDataType.VarBinary:
+                    option = SqlDataTypeOption.VarBinary;
+                    break;
+                case SqlDataType.Image:
+                    option = SqlDataTypeOption.Image;
+                    break;
+                case SqlDataType.Cursor:
+                    option = SqlDataTypeOption.Cursor;
+                    break;
+                case SqlDataType.Variant:
+                    option = SqlDataTypeOption.Sql_Variant;
+                    break;
+                case SqlDataType.Table:
+                    option = SqlDataTypeOption.Table;
+                    break;
+                case SqlDataType.Timestamp:
+                    option = SqlDataTypeOption.Timestamp;
+                    break;
+                case SqlDataType.UniqueIdentifier:
+                    option = SqlDataTypeOption.UniqueIdentifier;
+                    break;
+                case SqlDataType.Xml:
+                    //??
+                    break;
+                case SqlDataType.Date:
+                    option = SqlDataTypeOption.Date;
+                    break;
+                case SqlDataType.Time:
+                    option = SqlDataTypeOption.Time;
+                    break;
+                case SqlDataType.DateTime2:
+                    option = SqlDataTypeOption.DateTime2;
+
+                    break;
+                case SqlDataType.DateTimeOffset:
+                    option = SqlDataTypeOption.DateTimeOffset;
+                    break;
+                case SqlDataType.Rowversion:
+                    option = SqlDataTypeOption.Rowversion;
+                    break;
+                default:
+                    throw new ArgumentOutOfRangeException("type");
+            }
+
+            return new SqlDataTypeReference
+            {
+                SqlDataTypeOption = option
+            };
+        }
+
+        private ScalarExpression GetDefaultValue(SqlDataTypeReference type)
+        {
+            switch (type.SqlDataTypeOption)
+            {
+                case SqlDataTypeOption.SmallInt:
+                case SqlDataTypeOption.TinyInt:
+                case SqlDataTypeOption.Bit:
+                case SqlDataTypeOption.Decimal:
+                case SqlDataTypeOption.Numeric:
+                case SqlDataTypeOption.Money:
+                case SqlDataTypeOption.SmallMoney:
+                case SqlDataTypeOption.Float:
+                case SqlDataTypeOption.Real:
+                case SqlDataTypeOption.BigInt:
+                case SqlDataTypeOption.Int:
+                    return new IntegerLiteral { Value = "0" };
+
+                case SqlDataTypeOption.Char:
+                case SqlDataTypeOption.VarChar:
+                case SqlDataTypeOption.Text:
+                case SqlDataTypeOption.NChar:
+                case SqlDataTypeOption.NVarChar:
+                case SqlDataTypeOption.NText:
+
+                    return new StringLiteral { Value = "" };
+
+                case SqlDataTypeOption.Binary:
+                case SqlDataTypeOption.VarBinary:
+                case SqlDataTypeOption.Image:
+                    return new BinaryLiteral { Value = "0" };
+
+
+                case SqlDataTypeOption.UniqueIdentifier:
+                    return new StringLiteral { Value = Guid.NewGuid().ToString() };
+
+
+                case SqlDataTypeOption.DateTime:
+                case SqlDataTypeOption.SmallDateTime:
+                case SqlDataTypeOption.Date:
+                case SqlDataTypeOption.DateTime2:
+                    return new StringLiteral { Value = "1980-04-01" }; //yes i did do that
+
+                case SqlDataTypeOption.Time:
+                    return new StringLiteral { Value = "11:59:59" }; //yes i did do that
+            }
+
+            return new StringLiteral { Value = "0" };
+        }
+    }
+}
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureVisitor.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureVisitor.cs
new file mode 100644
index 0000000..cb5cd7b
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ProcedureVisitor.cs
@@ -0,0 +1,21 @@
+using System.Collections.Generic;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class ProcedureVisitor : TSqlFragmentVisitor
+    {
+        public readonly List<CreateProcedureStatement> Procedures = new List<CreateProcedureStatement>();
+        public readonly List<CreateFunctionStatement> Functions = new List<CreateFunctionStatement>();
+
+        public override void Visit(CreateProcedureStatement node)
+        {
+            Procedures.Add(node);
+        }
+
+        public override void Visit(CreateFunctionStatement node)
+        {
+            Functions.Add(node);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/SchemaBuilder.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/SchemaBuilder.cs
new file mode 100644
index 0000000..7b49a07
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/SchemaBuilder.cs
@@ -0,0 +1,137 @@
+using System.Collections.Generic;
+using System.IO;
+using EnvDTE;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+using SSDTDevPack.Common;
+using SSDTDevPack.Common.Dac;
+using SSDTDevPack.Common.ProjectItems;
+using SSDTDevPack.Common.SolutionBrowser;
+using SSDTDevPack.tSQLtStubber;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class SchemaBuilder : ScriptBuilder
+    {
+        private readonly string _scripts;
+
+        public SchemaBuilder(string scripts)
+        {
+            _scripts = scripts;
+        }
+
+        public void CreateSchemas()
+        {
+            IList<ParseError> errors;
+            var fragment = new TSql120Parser(false).Parse(new StringReader(_scripts), out errors);
+            if (fragment == null)
+                return;
+
+            var visitor = new ProcedureVisitor();
+            fragment.Accept(visitor);
+
+            foreach (var procedure in visitor.Procedures)
+            {
+                var browser = new SolutionBrowserForm(procedure.ProcedureReference.Name.BaseIdentifier.Value.Quote());
+                browser.ShowDialog();
+
+                var destination = browser.DestinationItem;
+                if (destination == null)
+                    continue;
+
+                var parentProjectItem = destination;
+
+                var name = browser.GetObjectName();
+                var script = GetScript(name);
+
+                for (var i = 1; i <= parentProjectItem.ProjectItems.Count; i++)
+                {
+                    var item = parentProjectItem.ProjectItems.Item(i);
+                    if (item.Name.UnQuote() == name.UnQuote())
+                    {
+                        CreateNewFile(item, name, script);
+                        return;
+                    }
+                }
+
+                var folder = parentProjectItem.ProjectItems.AddFolder(name.UnQuote());
+                CreateNewFile(folder, name, script);
+            }
+
+            foreach (var procedure in visitor.Functions)
+            {
+                var browser = new SolutionBrowserForm(procedure
+                    .Name.BaseIdentifier.Value.Quote());
+                browser.ShowDialog();
+
+                var destination = browser.DestinationItem;
+                if (destination == null)
+                    continue;
+
+                var parentProjectItem = destination;
+
+                var name = browser.GetObjectName();
+                var script = GetScript(name);
+
+                for (var i = 1; i <= parentProjectItem.ProjectItems.Count; i++)
+                {
+                    var item = parentProjectItem.ProjectItems.Item(i);
+                    if (item.Name.UnQuote() == name.UnQuote())
+                    {
+                        CreateNewFile(item, name, script);
+                        return;
+                    }
+                }
+
+                var folder = parentProjectItem.ProjectItems.AddFolder(name.UnQuote());
+                CreateNewFile(folder, name, script);
+            }
+        }
+
+        private static void CreateNewFile(ProjectItem folder, string name, string script)
+        {
+            var classFolder = folder.ProjectItems.AddFromTemplate("Schema", name.UnQuote() + ".sql");
+            var filePath = classFolder.GetStringProperty("FullPath");
+            File.WriteAllText(filePath, script);
+        }
+
+        private string GetScript(string schemaName)
+        {
+            return string.Format("{0}\r\nGO\r\n{1}", GetSchema(schemaName), GetExtendedProperty(schemaName));
+        }
+
+        private string GetSchema(string schemaName)
+        {
+            var createSchema = new CreateSchemaStatement();
+            createSchema.Name = new Identifier {Value = schemaName.UnQuote(), QuoteType = QuoteType.SquareBracket};
+            createSchema.Owner = new Identifier {Value = "dbo"};
+
+            return GenerateScript(createSchema);
+        }
+
+        private string GetExtendedProperty(string schemaName)
+        {
+            var execExtendedProperty = new ExecuteStatement();
+            execExtendedProperty.ExecuteSpecification = new ExecuteSpecification();
+
+            var name = new ChildObjectName();
+            name.Identifiers.Add(new Identifier {Value = _scripts});
+
+            var procedureReference = new ProcedureReference();
+            procedureReference.Name = "sp_addextendedproperty".ToSchemaObjectName();
+
+            var entity = new ExecutableProcedureReference();
+            entity.ProcedureReference = new ProcedureReferenceName();
+            entity.ProcedureReference.ProcedureReference = procedureReference;
+
+
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("@name", "tSQLt.TestClass"));
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("@value", 1));
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("@level0type", "SCHEMA"));
+            entity.Parameters.Add(ParametersHelper.CreateStoredProcedureParameter("@level0name", schemaName.UnQuote()));
+
+            execExtendedProperty.ExecuteSpecification.ExecutableEntity = entity;
+
+            return GenerateScript(execExtendedProperty);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ScriptBuilder.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ScriptBuilder.cs
new file mode 100644
index 0000000..b44b9cc
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/ScriptBuilder.cs
@@ -0,0 +1,23 @@
+using System.Collections.Generic;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+using SSDTDevPack.Common.Settings;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class ScriptBuilder
+    {
+        protected string GenerateScript(TSqlFragment fragment)
+        {
+            string script;
+            var generator = new Sql120ScriptGenerator(SavedSettings.Get().GeneratorOptions);
+            generator.GenerateScript(fragment, out script);
+            return script;
+        }
+
+        protected IList<TSqlParserToken> GetTokens(TSqlFragment fragment)
+        {
+            var generator = new Sql120ScriptGenerator(SavedSettings.Get().GeneratorOptions);
+            return generator.GenerateTokens(fragment);
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Common/tSQLtStubber/TestBuilder.cs b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/TestBuilder.cs
new file mode 100644
index 0000000..f850017
--- /dev/null
+++ b/src/Common/src/SSDTDevPack.Common/tSQLtStubber/TestBuilder.cs
@@ -0,0 +1,115 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Windows.Forms;
+using EnvDTE;
+using Microsoft.SqlServer.Dac.Model;
+using Microsoft.SqlServer.TransactSql.ScriptDom;
+using SSDTDevPack.Common.Dac;
+using SSDTDevPack.Common.ProjectItems;
+using SSDTDevPack.Common.SolutionBrowser;
+
+namespace SSDTDevPack.tSQLtStubber
+{
+    public class TestBuilder : ScriptBuilder
+    {
+        private readonly string _scripts;
+        private readonly Project _sourceProject;
+
+        public TestBuilder(string scripts, Project sourceProject)
+        {
+            _scripts = scripts;
+            _sourceProject = sourceProject;
+        }
+
+        public void Go(){
+
+            IList<ParseError> errors;
+            var fragment = new TSql120Parser(false).Parse(new StringReader(_scripts), out errors);
+            if (fragment == null)
+                return;
+
+            var visitor = new ProcedureVisitor();
+            fragment.Accept(visitor);
+
+            using (var procedureRepository = new ProcedureRepository(DacpacPath.Get(_sourceProject)))
+            using (var functionRepository = new FunctionRepository(DacpacPath.Get(_sourceProject)))
+            {
+                foreach (var procedure in visitor.Procedures)
+                {
+                    var browser = new SolutionBrowserForm("test " + procedure.ProcedureReference.Name.BaseIdentifier.Value.UnQuote() + " does something");
+                    browser.ShowDialog();
+
+                    var destination = browser.DestinationItem;
+                    if (destination == null)
+                        continue;
+
+                    if (String.IsNullOrEmpty(DacpacPath.Get(_sourceProject)) && !File.Exists(DacpacPath.Get(_sourceProject)))
+                    {
+                        MessageBox.Show("Cannot find dacpac for project");
+                        return;
+                    }
+                    
+                    var parentProjectItem = destination;
+                        
+                    var name = browser.GetObjectName();
+                    
+                    var proc = procedureRepository.FirstOrDefault(p => p.Name.EqualsName(procedure.ProcedureReference.Name));
+                    if (proc == null)
+                    {
+                        MessageBox.Show(string.Format("Cannot find stored procedure {0} in project compiled dacpac", procedure.ProcedureReference.Name));
+                        return;
+                    }
+
+                    var testBuilder = new ProcedureBuilder(procedure.ProcedureReference.Name.BaseIdentifier.Value.UnQuote(), name, proc);
+                    var script = testBuilder.GetScript();
+
+                    CreateNewFile(parentProjectItem, name , script);
+                }
+
+                foreach (var procedure in visitor.Functions)
+                {
+                    var browser = new SolutionBrowserForm("test " + procedure.Name.BaseIdentifier.Value.UnQuote() + " does something");
+                    browser.ShowDialog();
+
+                    var destination = browser.DestinationItem;
+                    if (destination == null)
+                        continue;
+
+                    if (String.IsNullOrEmpty(DacpacPath.Get(_sourceProject)) && !File.Exists(DacpacPath.Get(_sourceProject)))
+                    {
+                        MessageBox.Show("Cannot find dacpac for project");
+                        return;
+                    }
+
+                    var parentProjectItem = destination;
+
+                    var name = browser.GetObjectName();
+
+                    var proc = functionRepository.FirstOrDefault(p => p.Name.EqualsName(procedure.Name));
+                    if (proc == null)
+                    {
+                        MessageBox.Show(string.Format("Cannot find stored procedure {0} in project compiled dacpac", procedure.Name));
+                        return;
+                    }
+
+                    var testBuilder = new ProcedureBuilder(procedure.Name.BaseIdentifier.Value.UnQuote(), name, proc);
+                    var script = testBuilder.GetScript();
+
+                    CreateNewFile(parentProjectItem, name, script);
+                }
+            }
+        }
+
+        private static void CreateNewFile(ProjectItem folder, string name, string script)
+        {
+            var classFolder = folder.ProjectItems.AddFromTemplate("Schema", name.UnQuote() + ".sql");
+            var filePath = classFolder.GetStringProperty("FullPath");
+            File.WriteAllText(filePath, script);
+
+            classFolder.Open().Visible = true;
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/src/Common/src/SSDTDevPack.Logging/SSDTDevPack.Logging.csproj b/src/Common/src/SSDTDevPack.Logging/SSDTDevPack.Logging.csproj
index f440cf3..f1e07a6 100644
--- a/src/Common/src/SSDTDevPack.Logging/SSDTDevPack.Logging.csproj
+++ b/src/Common/src/SSDTDevPack.Logging/SSDTDevPack.Logging.csproj
@@ -70,6 +70,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NLog">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\NLog.4.0.1\lib\net45\NLog.dll</HintPath>
     </Reference>
@@ -85,7 +101,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Log.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/Common/src/SSDTDevPack.Logging/packages.config b/src/Common/src/SSDTDevPack.Logging/packages.config
index 8786c44..61e401f 100644
--- a/src/Common/src/SSDTDevPack.Logging/packages.config
+++ b/src/Common/src/SSDTDevPack.Logging/packages.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
   <package id="NLog" version="4.0.1" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Merge/src/SSDTDevPack.Indexes/SSDTDevPack.Rewriter.csproj b/src/Merge/src/SSDTDevPack.Indexes/SSDTDevPack.Rewriter.csproj
index 8db32b7..ad970b7 100644
--- a/src/Merge/src/SSDTDevPack.Indexes/SSDTDevPack.Rewriter.csproj
+++ b/src/Merge/src/SSDTDevPack.Indexes/SSDTDevPack.Rewriter.csproj
@@ -76,6 +76,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -88,13 +104,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ChunkDeletesRewriter.cs" />
-    <Compile Include="DuplicateIndexFinder.cs" />
-    <Compile Include="NonSargableRewrites.cs" />
-    <Compile Include="OrderByOrdinalRewrites.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Replacements.cs" />
-    <Compile Include="TableReferenceRewriter.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
diff --git a/src/Merge/src/SSDTDevPack.Indexes/packages.config b/src/Merge/src/SSDTDevPack.Indexes/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/Merge/src/SSDTDevPack.Indexes/packages.config
+++ b/src/Merge/src/SSDTDevPack.Indexes/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.csproj b/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.csproj
index e9db981..4bc6bd9 100644
--- a/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.csproj
+++ b/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.csproj
@@ -84,6 +84,18 @@
       <HintPath>packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -107,96 +119,19 @@
     <Reference Include="WindowsFormsIntegration" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="MergeDescriptor\Merge.cs" />
-    <Compile Include="MergeDescriptor\MergeOptions.cs" />
-    <Compile Include="Parsing\MergeStatementFactory.cs" />
-    <Compile Include="Parsing\MergeStatementParser.cs" />
-    <Compile Include="Parsing\MergeStatementRepository.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="UI\AddTableDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\AddTableDialog.Designer.cs">
-      <DependentUpon>AddTableDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\ConnectDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\ConnectDialog.Designer.cs">
-      <DependentUpon>ConnectDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\ImportMultipleTablesDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\ImportMultipleTablesDialog.Designer.cs">
-      <DependentUpon>ImportMultipleTablesDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\ImportOverwriteTable.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\ImportOverwriteTable.Designer.cs">
-      <DependentUpon>ImportOverwriteTable.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\ImportSingleTableDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="UI\ImportSingleTableDialog.Designer.cs">
-      <DependentUpon>ImportSingleTableDialog.cs</DependentUpon>
-    </Compile>
-    <Compile Include="UI\MainWindow.xaml.cs">
-      <DependentUpon>MainWindow.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UI\TablePage.xaml.cs">
-      <DependentUpon>TablePage.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="UI\UIProperties.cs" />
-    <Compile Include="UI\UiSettings.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\SSDTDevPack.Logging\SSDTDevPack.Logging.csproj">
-      <Project>{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}</Project>
-      <Name>SSDTDevPack.Logging</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="UI\MainWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-    <Page Include="UI\TablePage.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="UI\AddTableDialog.resx">
-      <DependentUpon>AddTableDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\ConnectDialog.resx">
-      <DependentUpon>ConnectDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\ImportMultipleTablesDialog.resx">
-      <DependentUpon>ImportMultipleTablesDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\ImportOverwriteTable.resx">
-      <DependentUpon>ImportOverwriteTable.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="UI\ImportSingleTableDialog.resx">
-      <DependentUpon>ImportSingleTableDialog.cs</DependentUpon>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="069085-black-paint-splatter-icon-alphanumeric-letter-m.png" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.sln b/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.sln
index 35ebe4f..7a26319 100644
--- a/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.sln
+++ b/src/Merge/src/SSDTDevPack.Merge/SSDTDevPack.Merge.sln
@@ -1,10 +1,8 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26403.3
+VisualStudioVersion = 15.0.26403.7
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Merge", "Merge", "{267A52F1-0C75-4EEE-8452-C8A6DC3FAC6C}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".Test", ".Test", "{9A90C098-0101-4C8E-ACED-6195397F193E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Merge", "Merge", "{7991F354-4F3E-4033-8016-BA4E568002DC}"
@@ -15,36 +13,16 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{FA378D
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common", "Common", "{9B39C8C5-7C84-4E86-98B4-749A897A7B65}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NameConstraints", "NameConstraints", "{DE72FFC0-5479-4D95-8E6F-4C1ACBE2E6CA}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NameConstraints", "NameConstraints", "{D49C24B8-62AE-4783-A6B8-D3C7F4DB1EC8}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tSQLtStubber", "tSQLtStubber", "{AEBDFD2A-E81C-428F-8183-F867EA326302}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QueryCosts", "QueryCosts", "{3B3C82D4-323A-486B-9891-9BF0611C2C4D}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QueryCosts", "QueryCosts", "{F6DAB819-6CE1-4B68-B17A-A4C19A5BFCF3}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "QuickDeploy", "QuickDeploy", "{E243C354-9615-49DC-8B5E-06A6BE9A844B}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Formatting", "Formatting", "{E9DB681B-A6F3-4F82-A8C3-121AC257FC00}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extraction", "Extraction", "{2D000B28-6C81-4CD4-B863-ED14A239C1D1}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Indexes", "Indexes", "{4673179F-A739-4669-A4BF-510EC72CD692}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Clippy", "Clippy", "{F689D4EA-0D04-4338-8912-6A310F1E1036}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestProjects", "TestProjects", "{B807E65A-A87C-47AF-8BAA-CC4519383DD9}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "CodeCoverage", "CodeCoverage", "{60440AF9-3F82-49BB-9325-61270403ABED}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Merge", "SSDTDevPack.Merge.csproj", "{EF0F4A6D-68A4-4745-A3D5-2118A1608721}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Merge.UnitTests", "..\..\..\Test\Merge\SSDTDevPack.Merge.UnitTests\SSDTDevPack.Merge.UnitTests.csproj", "{7918DB31-5F79-496F-A042-095B81FDFEA5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WinFormHost.Merge", "..\..\..\Test\Merge\WinFormHost.Merge\WinFormHost.Merge.csproj", "{C0F32A92-D9DC-4C86-9648-773D9DC74107}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Common", "..\..\..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj", "{D6638892-5597-40C3-916A-E020871F7077}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Common.UnitTests", "..\..\..\Test\Common\SSDTDevPack.Common.UnitTests\SSDTDevPack.Common.UnitTests.csproj", "{1E06CB0E-0311-45A5-8F6F-7E0E5AB3F8DE}"
@@ -53,56 +31,28 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Common.Integrat
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.VSPackage", "..\SSDTDevPack.VSPackage\SSDTDevPack.VSPackage.csproj", "{56ADCEA8-F366-4CD5-ACB2-1AF0E5E31896}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Logging", "..\..\..\Common\src\SSDTDevPack.Logging\SSDTDevPack.Logging.csproj", "{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlConnectionTest", "..\..\..\Test\Common\SqlConnectionTest\SqlConnectionTest.csproj", "{C8DD4334-E686-473C-A603-954CE644D4D0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.NameConstraints", "..\..\..\NameConstraints\src\SSDTDevPack.NameConstraints\SSDTDevPack.NameConstraints.csproj", "{289C1F12-3F83-4061-B88E-04493B015102}"
-EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "ProjectWithConstraints", "..\..\..\Test\NameConstraints\ProjectWithConstraints\ProjectWithConstraints.sqlproj", "{52FA5B53-4761-44B0-8C1B-7218EE8A9594}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NameConstraints.IntegrationTests", "..\..\..\Test\NameConstraints\NameConstraints.IntegrationTests\NameConstraints.IntegrationTests.csproj", "{EBD5DAE2-030E-4616-B6BB-B47101E9C8C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.tSQLtStubber", "..\..\..\tSQLtStubber\SSDTDevPack.tSQLtStubber\SSDTDevPack.tSQLtStubber.csproj", "{570FE172-C718-4904-849D-641BB7395BD4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.QueryCosts", "..\..\..\SSDTDevPack.QueryCosts\SSDTDevPack.QueryCosts.csproj", "{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.QueryCosts.UnitTests", "..\..\..\Test\QueryCost\SSDTDevPack.QueryCosts.UnitTests\SSDTDevPack.QueryCosts.UnitTests.csproj", "{F26271B2-E4B3-4D01-9E46-F1BB75336CBA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.QuickDeploy", "..\..\..\SSDTDevPack.QuickDeploy\SSDTDevPack.QuickDeploy.csproj", "{B8718439-7ACF-4828-8559-D3B036AA48CC}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Formatting", "..\..\..\SSDTDevPack.Formatting\SSDTDevPack.Formatting.csproj", "{BE989570-115B-4961-8E46-1A2D0419EC80}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Extraction", "..\..\..\SSDTDevPack.Extraction\SSDTDevPack.Extraction.csproj", "{9E202C62-FEAD-4622-9803-51B35423CEF4}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Rewriter", "..\SSDTDevPack.Indexes\SSDTDevPack.Rewriter.csproj", "{94813D75-0291-450F-A7BD-D3161FF4A2CB}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.Clippy", "..\..\..\SSDTDevPack.Clippy\SSDTDevPack.Clippy.csproj", "{39260B5D-306E-469B-BAE5-58C088BDD447}"
-EndProject
 Project("{00D1A9C2-B5F0-4AF3-8072-F6C62B433612}") = "Nested", "..\..\..\Test\Common\SampleSolutions\NestedProjects\Nested\Nested.sqlproj", "{5A32B58D-1E86-409A-8258-AEA0F0A07123}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.CodeCoverage", "..\..\..\SSDTDevPack.CodeCoverage\SSDTDevPack.CodeCoverage.csproj", "{6BCAF9C4-F47C-4B0D-BE37-063EEC1A11D2}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSDTDevPack.CCover", "..\..\..\SSDTDevPack.CCover\SSDTDevPack.CCover.csproj", "{F9577A2E-2D01-4419-979E-0A85A425C404}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{EF0F4A6D-68A4-4745-A3D5-2118A1608721}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{EF0F4A6D-68A4-4745-A3D5-2118A1608721}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{EF0F4A6D-68A4-4745-A3D5-2118A1608721}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{EF0F4A6D-68A4-4745-A3D5-2118A1608721}.Release|Any CPU.Build.0 = Release|Any CPU
 		{7918DB31-5F79-496F-A042-095B81FDFEA5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{7918DB31-5F79-496F-A042-095B81FDFEA5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7918DB31-5F79-496F-A042-095B81FDFEA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7918DB31-5F79-496F-A042-095B81FDFEA5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0F32A92-D9DC-4C86-9648-773D9DC74107}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0F32A92-D9DC-4C86-9648-773D9DC74107}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0F32A92-D9DC-4C86-9648-773D9DC74107}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0F32A92-D9DC-4C86-9648-773D9DC74107}.Release|Any CPU.Build.0 = Release|Any CPU
 		{D6638892-5597-40C3-916A-E020871F7077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{D6638892-5597-40C3-916A-E020871F7077}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D6638892-5597-40C3-916A-E020871F7077}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -119,18 +69,10 @@ Global
 		{56ADCEA8-F366-4CD5-ACB2-1AF0E5E31896}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{56ADCEA8-F366-4CD5-ACB2-1AF0E5E31896}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{56ADCEA8-F366-4CD5-ACB2-1AF0E5E31896}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F54FDAD9-CD38-4142-BF69-4E1CE83D364A}.Release|Any CPU.Build.0 = Release|Any CPU
 		{C8DD4334-E686-473C-A603-954CE644D4D0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{C8DD4334-E686-473C-A603-954CE644D4D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C8DD4334-E686-473C-A603-954CE644D4D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C8DD4334-E686-473C-A603-954CE644D4D0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{289C1F12-3F83-4061-B88E-04493B015102}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{289C1F12-3F83-4061-B88E-04493B015102}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{289C1F12-3F83-4061-B88E-04493B015102}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{289C1F12-3F83-4061-B88E-04493B015102}.Release|Any CPU.Build.0 = Release|Any CPU
 		{52FA5B53-4761-44B0-8C1B-7218EE8A9594}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{52FA5B53-4761-44B0-8C1B-7218EE8A9594}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{52FA5B53-4761-44B0-8C1B-7218EE8A9594}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -141,38 +83,10 @@ Global
 		{EBD5DAE2-030E-4616-B6BB-B47101E9C8C1}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EBD5DAE2-030E-4616-B6BB-B47101E9C8C1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{EBD5DAE2-030E-4616-B6BB-B47101E9C8C1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{570FE172-C718-4904-849D-641BB7395BD4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{570FE172-C718-4904-849D-641BB7395BD4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{570FE172-C718-4904-849D-641BB7395BD4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{570FE172-C718-4904-849D-641BB7395BD4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F26271B2-E4B3-4D01-9E46-F1BB75336CBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F26271B2-E4B3-4D01-9E46-F1BB75336CBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F26271B2-E4B3-4D01-9E46-F1BB75336CBA}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F26271B2-E4B3-4D01-9E46-F1BB75336CBA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{B8718439-7ACF-4828-8559-D3B036AA48CC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B8718439-7ACF-4828-8559-D3B036AA48CC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B8718439-7ACF-4828-8559-D3B036AA48CC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B8718439-7ACF-4828-8559-D3B036AA48CC}.Release|Any CPU.Build.0 = Release|Any CPU
-		{BE989570-115B-4961-8E46-1A2D0419EC80}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{BE989570-115B-4961-8E46-1A2D0419EC80}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{BE989570-115B-4961-8E46-1A2D0419EC80}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{BE989570-115B-4961-8E46-1A2D0419EC80}.Release|Any CPU.Build.0 = Release|Any CPU
-		{9E202C62-FEAD-4622-9803-51B35423CEF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{9E202C62-FEAD-4622-9803-51B35423CEF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{9E202C62-FEAD-4622-9803-51B35423CEF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{9E202C62-FEAD-4622-9803-51B35423CEF4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{94813D75-0291-450F-A7BD-D3161FF4A2CB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{94813D75-0291-450F-A7BD-D3161FF4A2CB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{94813D75-0291-450F-A7BD-D3161FF4A2CB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{94813D75-0291-450F-A7BD-D3161FF4A2CB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{39260B5D-306E-469B-BAE5-58C088BDD447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{39260B5D-306E-469B-BAE5-58C088BDD447}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{39260B5D-306E-469B-BAE5-58C088BDD447}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{39260B5D-306E-469B-BAE5-58C088BDD447}.Release|Any CPU.Build.0 = Release|Any CPU
 		{5A32B58D-1E86-409A-8258-AEA0F0A07123}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{5A32B58D-1E86-409A-8258-AEA0F0A07123}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5A32B58D-1E86-409A-8258-AEA0F0A07123}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
@@ -183,10 +97,6 @@ Global
 		{6BCAF9C4-F47C-4B0D-BE37-063EEC1A11D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6BCAF9C4-F47C-4B0D-BE37-063EEC1A11D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6BCAF9C4-F47C-4B0D-BE37-063EEC1A11D2}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F9577A2E-2D01-4419-979E-0A85A425C404}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F9577A2E-2D01-4419-979E-0A85A425C404}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F9577A2E-2D01-4419-979E-0A85A425C404}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F9577A2E-2D01-4419-979E-0A85A425C404}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -197,28 +107,16 @@ Global
 		{D49C24B8-62AE-4783-A6B8-D3C7F4DB1EC8} = {9A90C098-0101-4C8E-ACED-6195397F193E}
 		{F6DAB819-6CE1-4B68-B17A-A4C19A5BFCF3} = {9A90C098-0101-4C8E-ACED-6195397F193E}
 		{B807E65A-A87C-47AF-8BAA-CC4519383DD9} = {9A90C098-0101-4C8E-ACED-6195397F193E}
-		{EF0F4A6D-68A4-4745-A3D5-2118A1608721} = {267A52F1-0C75-4EEE-8452-C8A6DC3FAC6C}
 		{7918DB31-5F79-496F-A042-095B81FDFEA5} = {7991F354-4F3E-4033-8016-BA4E568002DC}
-		{C0F32A92-D9DC-4C86-9648-773D9DC74107} = {7991F354-4F3E-4033-8016-BA4E568002DC}
 		{D6638892-5597-40C3-916A-E020871F7077} = {FA378D3A-6112-4268-AC8B-30DFF09689CF}
 		{1E06CB0E-0311-45A5-8F6F-7E0E5AB3F8DE} = {9B39C8C5-7C84-4E86-98B4-749A897A7B65}
 		{75EFA0B2-5CDE-44A9-A3A7-92D1951F42DC} = {9B39C8C5-7C84-4E86-98B4-749A897A7B65}
 		{56ADCEA8-F366-4CD5-ACB2-1AF0E5E31896} = {BCE31748-0542-4EB2-BFA1-ABDB73D568AE}
-		{F54FDAD9-CD38-4142-BF69-4E1CE83D364A} = {FA378D3A-6112-4268-AC8B-30DFF09689CF}
 		{C8DD4334-E686-473C-A603-954CE644D4D0} = {9B39C8C5-7C84-4E86-98B4-749A897A7B65}
-		{289C1F12-3F83-4061-B88E-04493B015102} = {DE72FFC0-5479-4D95-8E6F-4C1ACBE2E6CA}
 		{52FA5B53-4761-44B0-8C1B-7218EE8A9594} = {D49C24B8-62AE-4783-A6B8-D3C7F4DB1EC8}
 		{EBD5DAE2-030E-4616-B6BB-B47101E9C8C1} = {D49C24B8-62AE-4783-A6B8-D3C7F4DB1EC8}
-		{570FE172-C718-4904-849D-641BB7395BD4} = {AEBDFD2A-E81C-428F-8183-F867EA326302}
-		{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357} = {3B3C82D4-323A-486B-9891-9BF0611C2C4D}
 		{F26271B2-E4B3-4D01-9E46-F1BB75336CBA} = {F6DAB819-6CE1-4B68-B17A-A4C19A5BFCF3}
-		{B8718439-7ACF-4828-8559-D3B036AA48CC} = {E243C354-9615-49DC-8B5E-06A6BE9A844B}
-		{BE989570-115B-4961-8E46-1A2D0419EC80} = {E9DB681B-A6F3-4F82-A8C3-121AC257FC00}
-		{9E202C62-FEAD-4622-9803-51B35423CEF4} = {2D000B28-6C81-4CD4-B863-ED14A239C1D1}
-		{94813D75-0291-450F-A7BD-D3161FF4A2CB} = {4673179F-A739-4669-A4BF-510EC72CD692}
-		{39260B5D-306E-469B-BAE5-58C088BDD447} = {F689D4EA-0D04-4338-8912-6A310F1E1036}
 		{5A32B58D-1E86-409A-8258-AEA0F0A07123} = {B807E65A-A87C-47AF-8BAA-CC4519383DD9}
 		{6BCAF9C4-F47C-4B0D-BE37-063EEC1A11D2} = {60440AF9-3F82-49BB-9325-61270403ABED}
-		{F9577A2E-2D01-4419-979E-0A85A425C404} = {60440AF9-3F82-49BB-9325-61270403ABED}
 	EndGlobalSection
 EndGlobal
diff --git a/src/Merge/src/SSDTDevPack.Merge/packages.config b/src/Merge/src/SSDTDevPack.Merge/packages.config
index 3c20413..ec490a5 100644
--- a/src/Merge/src/SSDTDevPack.Merge/packages.config
+++ b/src/Merge/src/SSDTDevPack.Merge/packages.config
@@ -3,4 +3,7 @@
   <package id="MahApps.Metro" version="1.1.2.0" targetFramework="net45" />
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj b/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
index 245343c..03a0a79 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
+++ b/src/Merge/src/SSDTDevPack.VSPackage/SSDTDevPack.VSPackage.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
+  <Import Project="..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props" Condition="Exists('..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" />
   <PropertyGroup>
     <MinimumVisualStudioVersion>15.0</MinimumVisualStudioVersion>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
@@ -25,6 +26,8 @@
     <UseApplicationTrust>false</UseApplicationTrust>
     <BootstrapperEnabled>true</BootstrapperEnabled>
     <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
@@ -63,40 +66,115 @@
     </CopyVsixExtensionLocation>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="EnvDTE, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\SSDTDevPack.Merge\packages\EnvDTE.8.0.1\lib\net10\EnvDTE.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="envdte100, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\envdte100.dll</HintPath>
+    </Reference>
+    <Reference Include="EnvDTE80, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\SSDTDevPack.Merge\packages\EnvDTE80.8.0.1\lib\net10\EnvDTE80.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="envdte90, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\envdte90.dll</HintPath>
+    </Reference>
+    <Reference Include="envdte90a, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <SpecificVersion>False</SpecificVersion>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\Common7\IDE\PublicAssemblies\envdte90a.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
+    <Reference Include="Microsoft.Data.Tools.Components, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Components.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Contracts, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Contracts.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Data.Tools.Schema.Sql, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server\130\DAC\bin\Microsoft.Data.Tools.Schema.Sql.dll</HintPath>
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Schema.Sql.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Schema.Tasks.Sql, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Schema.Tasks.Sql.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Schema.Utilities.Sql, Version=15.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Schema.Utilities.Sql.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Data.Tools.Utilities, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.Data.Tools.Utilities.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.ConnectionInfo, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.ConnectionInfo.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.SqlServer.Dac, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server\130\DAC\bin\Microsoft.SqlServer.Dac.dll</HintPath>
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.Dac.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.SqlServer.Dac.Extensions, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.Dac.Extensions.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.SqlClrProvider, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.SqlClrProvider.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server\130\DAC\bin\Microsoft.SqlServer.Dac.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.0.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\..\..\Program Files (x86)\Microsoft SQL Server\130\SDK\Assemblies\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.11.0">
-      <EmbedInteropTypes>true</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.7.10.6071\lib\Microsoft.VisualStudio.Shell.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.10.0, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.10.0.10.0.30319\lib\Microsoft.VisualStudio.Shell.Interop.10.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.Shell.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Interop.9.0.9.0.30729\lib\Microsoft.VisualStudio.Shell.Interop.9.0.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.TextManager.Interop.7.10.6070\lib\Microsoft.VisualStudio.TextManager.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.TextManager.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.TextManager.Interop.8.0.8.0.50727\lib\Microsoft.VisualStudio.TextManager.Interop.8.0.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.Shell.Interop.12.0">
-      <EmbedInteropTypes>true</EmbedInteropTypes>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.TextManager.Interop" />
-    <Reference Include="Microsoft.VisualStudio.Shell.12.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.10.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.11.0" />
-    <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Data" />
@@ -110,42 +188,6 @@
     <Reference Include="System.Xaml" />
   </ItemGroup>
   <ItemGroup>
-    <COMReference Include="EnvDTE">
-      <Guid>{80CC9F66-E7D8-4DDD-85B6-D9E6CD0E93E2}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE100">
-      <Guid>{26AD1324-4B7C-44BC-84F8-B86AED45729F}</Guid>
-      <VersionMajor>10</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE80">
-      <Guid>{1A31287A-4D7D-413E-8E32-3B374931BD89}</Guid>
-      <VersionMajor>8</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
-    <COMReference Include="EnvDTE90">
-      <Guid>{2CE2370E-D744-4936-A090-3FFFE667B0E1}</Guid>
-      <VersionMajor>9</VersionMajor>
-      <VersionMinor>0</VersionMinor>
-      <Lcid>0</Lcid>
-      <WrapperTool>primary</WrapperTool>
-      <Isolated>False</Isolated>
-      <EmbedInteropTypes>False</EmbedInteropTypes>
-    </COMReference>
     <COMReference Include="Microsoft.VisualStudio.CommandBars">
       <Guid>{1CBA492E-7263-47BB-87FE-639000619B15}</Guid>
       <VersionMajor>8</VersionMajor>
@@ -200,6 +242,7 @@
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
     <None Include="app.config" />
+    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -236,58 +279,6 @@
       <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
       <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Common\src\SSDTDevPack.Logging\SSDTDevPack.Logging.csproj">
-      <Project>{f54fdad9-cd38-4142-bf69-4e1ce83d364a}</Project>
-      <Name>SSDTDevPack.Logging</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\NameConstraints\src\SSDTDevPack.NameConstraints\SSDTDevPack.NameConstraints.csproj">
-      <Project>{289C1F12-3F83-4061-B88E-04493B015102}</Project>
-      <Name>SSDTDevPack.NameConstraints</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.Clippy\SSDTDevPack.Clippy.csproj">
-      <Project>{39260B5D-306E-469B-BAE5-58C088BDD447}</Project>
-      <Name>SSDTDevPack.Clippy</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.CodeCoverage\SSDTDevPack.CodeCoverage.csproj">
-      <Project>{6bcaf9c4-f47c-4b0d-be37-063eec1a11d2}</Project>
-      <Name>SSDTDevPack.CodeCoverage</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.Extraction\SSDTDevPack.Extraction.csproj">
-      <Project>{9E202C62-FEAD-4622-9803-51B35423CEF4}</Project>
-      <Name>SSDTDevPack.Extraction</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.Formatting\SSDTDevPack.Formatting.csproj">
-      <Project>{BE989570-115B-4961-8E46-1A2D0419EC80}</Project>
-      <Name>SSDTDevPack.Formatting</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.QueryCosts\SSDTDevPack.QueryCosts.csproj">
-      <Project>{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}</Project>
-      <Name>SSDTDevPack.QueryCosts</Name>
-      <IncludeOutputGroupsInVSIX>BuiltProjectOutputGroup%3bBuiltProjectOutputGroupDependencies%3bGetCopyToOutputDirectoryItems%3bSatelliteDllsProjectOutputGroup%3b</IncludeOutputGroupsInVSIX>
-      <IncludeOutputGroupsInVSIXLocalOnly>DebugSymbolsProjectOutputGroup%3b</IncludeOutputGroupsInVSIXLocalOnly>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.QuickDeploy\SSDTDevPack.QuickDeploy.csproj">
-      <Project>{B8718439-7ACF-4828-8559-D3B036AA48CC}</Project>
-      <Name>SSDTDevPack.QuickDeploy</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\tSQLtStubber\SSDTDevPack.tSQLtStubber\SSDTDevPack.tSQLtStubber.csproj">
-      <Project>{570FE172-C718-4904-849D-641BB7395BD4}</Project>
-      <Name>SSDTDevPack.tSQLtStubber</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SSDTDevPack.Indexes\SSDTDevPack.Rewriter.csproj">
-      <Project>{94813D75-0291-450F-A7BD-D3161FF4A2CB}</Project>
-      <Name>SSDTDevPack.Rewriter</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{EF0F4A6D-68A4-4745-A3D5-2118A1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\SSDTDevPack.CCover\SSDTDevPack.CCover.csproj">
-      <Project>{F9577A2E-2D01-4419-979E-0A85A425C404}</Project>
-      <Name>SSDTDevPacl.CCover</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <BootstrapperPackage Include=".NETFramework,Version=v4.5">
@@ -306,6 +297,16 @@
   </PropertyGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="$(VSToolsPath)\VSSDK\Microsoft.VsSDK.targets" Condition="'$(VSToolsPath)' != ''" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props')" Text="$([System.String]::Format('$(ErrorText)', '..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.props'))" />
+    <Error Condition="!Exists('..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets'))" />
+    <Error Condition="!Exists('..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets'))" />
+  </Target>
+  <Import Project="..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets" Condition="Exists('..\SSDTDevPack.Merge\packages\Microsoft.VSSDK.BuildTools.15.0.26201\build\Microsoft.VSSDK.BuildTools.targets')" />
+  <Import Project="..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets" Condition="Exists('..\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.SDK.VsixSuppression.14.0.50420-pre\build\Microsoft.VisualStudio.SDK.VsixSuppression.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/app.config b/src/Merge/src/SSDTDevPack.VSPackage/app.config
index aea2c37..b5904cd 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/app.config
+++ b/src/Merge/src/SSDTDevPack.VSPackage/app.config
@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.SqlServer.TransactSql.ScriptDom" publicKeyToken="89845dcd8080cc91" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-13.100.0.0" newVersion="13.100.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/packages.config b/src/Merge/src/SSDTDevPack.VSPackage/packages.config
new file mode 100644
index 0000000..20e8287
--- /dev/null
+++ b/src/Merge/src/SSDTDevPack.VSPackage/packages.config
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="EnvDTE" version="8.0.1" targetFramework="net46" />
+  <package id="EnvDTE80" version="8.0.1" targetFramework="net46" />
+  <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.SDK.VsixSuppression" version="14.0.50420-pre" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop" version="7.10.6071" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.10.0" version="10.0.30319" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Interop.9.0" version="9.0.30729" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.TextManager.Interop.8.0" version="8.0.50727" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VSSDK.BuildTools" version="15.0.26201" targetFramework="net46" developmentDependency="true" />
+  <package id="stdole" version="7.0.3301" targetFramework="net46" />
+</packages>
\ No newline at end of file
diff --git a/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest b/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
index 221c11f..f2774f5 100644
--- a/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
+++ b/src/Merge/src/SSDTDevPack.VSPackage/source.extension.vsixmanifest
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
   <Metadata>
-    <Identity Id="354e4235-c369-4a8f-a855-0318891c0903" Version="0.1.9.55" Language="en-US" Publisher="EdElliott" />
+    <Identity Id="354e4235-c369-4a8f-a855-0318891c0903" Version="0.2.0.2" Language="en-US" Publisher="EdElliott" />
     <DisplayName>SSDTDevPack</DisplayName>
     <Description xml:space="preserve">The Agile SQL Club devpack, tools to help SSDT database projects + dacpacs. Includes MergUi
     </Description>
@@ -10,7 +10,7 @@
     <Tags>SSDT, MergeUi, Refactor</Tags>
   </Metadata>
   <Installation InstalledByMsi="false">
-    <InstallationTarget Version="[12.0,14.0]" Id="Microsoft.VisualStudio.Pro" />
+    <InstallationTarget Version="[12.0,15.0]" Id="Microsoft.VisualStudio.Pro" />
   </Installation>
   <Dependencies>
     <Dependency Id="Microsoft.Framework.NDP" DisplayName="Microsoft .NET Framework" d:Source="Manual" Version="[4.5,)" />
@@ -18,7 +18,9 @@
   </Dependencies>
   <Assets>
     <Asset Type="Microsoft.VisualStudio.VsPackage" d:Source="Project" d:ProjectName="%CurrentProject%" Path="|%CurrentProject%;PkgdefProjectOutputGroup|" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" Path="|SSDTDevPack.QueryCosts|" d:ProjectName="SSDTDevPack.QueryCosts" />
-    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" d:ProjectName="SSDTDevPack.Clippy" Path="|SSDTDevPack.Clippy|" />
+    <Asset Type="Microsoft.VisualStudio.MefComponent" d:Source="Project" Path="|SSDTDevPack.Common|" d:ProjectName="SSDTDevPack.Common" />
   </Assets>
+  <Prerequisites>
+    <Prerequisite Id="Microsoft.VisualStudio.Component.CoreEditor" Version="[13.0,16.0)" />
+  </Prerequisites>
 </PackageManifest>
diff --git a/src/NameConstraints/src/SSDTDevPack.NameConstraints/SSDTDevPack.NameConstraints.csproj b/src/NameConstraints/src/SSDTDevPack.NameConstraints/SSDTDevPack.NameConstraints.csproj
index 46b6384..980596a 100644
--- a/src/NameConstraints/src/SSDTDevPack.NameConstraints/SSDTDevPack.NameConstraints.csproj
+++ b/src/NameConstraints/src/SSDTDevPack.NameConstraints/SSDTDevPack.NameConstraints.csproj
@@ -73,6 +73,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -85,7 +101,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ConstraintNamer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/NameConstraints/src/SSDTDevPack.NameConstraints/packages.config b/src/NameConstraints/src/SSDTDevPack.NameConstraints/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/NameConstraints/src/SSDTDevPack.NameConstraints/packages.config
+++ b/src/NameConstraints/src/SSDTDevPack.NameConstraints/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.CCover/SSDTDevPack.CCover.csproj b/src/SSDTDevPack.CCover/SSDTDevPack.CCover.csproj
index 3daad04..2fb316c 100644
--- a/src/SSDTDevPack.CCover/SSDTDevPack.CCover.csproj
+++ b/src/SSDTDevPack.CCover/SSDTDevPack.CCover.csproj
@@ -78,6 +78,18 @@
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -96,36 +108,18 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CodeCoverageMap.cs" />
-    <Compile Include="CodeCoverageStore.cs" />
-    <Compile Include="CoveredStatement.cs" />
-    <Compile Include="DatabaseGateway.cs" />
-    <Compile Include="ExtendedEventDataDataReader.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Ui\CodeCoverageWindow.xaml.cs">
-      <DependentUpon>CodeCoverageWindow.xaml</DependentUpon>
-    </Compile>
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="Ui\CodeCoverageWindow.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Merge\src\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{EF0F4A6D-68A4-4745-A3D5-2118A1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/SSDTDevPack.CCover/packages.config b/src/SSDTDevPack.CCover/packages.config
index f167d7f..58ad3cf 100644
--- a/src/SSDTDevPack.CCover/packages.config
+++ b/src/SSDTDevPack.CCover/packages.config
@@ -2,4 +2,7 @@
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.Clippy/SSDTDevPack.Clippy.csproj b/src/SSDTDevPack.Clippy/SSDTDevPack.Clippy.csproj
index b5a9c56..2282716 100644
--- a/src/SSDTDevPack.Clippy/SSDTDevPack.Clippy.csproj
+++ b/src/SSDTDevPack.Clippy/SSDTDevPack.Clippy.csproj
@@ -73,9 +73,9 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.VisualStudio.Editor, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -85,10 +85,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Language.Intellisense.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Immutable.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.Immutable.12.0.dll</HintPath>
@@ -118,6 +125,10 @@
       <EmbedInteropTypes>True</EmbedInteropTypes>
       <HintPath>..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio 12.0\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.TextManager.Interop.12.0.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -137,59 +148,18 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="ClippyGlyphFactoryProvider.cs" />
-    <Compile Include="ClippyGlyphFactory.cs" />
-    <Compile Include="ClippyOperation.cs" />
-    <Compile Include="ClippyReplacementOperation.cs" />
-    <Compile Include="ClippyReplacementOperations.cs" />
-    <Compile Include="ClippySettings.cs" />
-    <Compile Include="ClippyTag.cs" />
-    <Compile Include="ClippyTagger.cs" />
-    <Compile Include="ClippyTaggerProvider.cs" />
-    <Compile Include="MainWindow.xaml.cs" />
-    <Compile Include="MenuItem.xaml.cs">
-      <DependentUpon>MenuItem.xaml</DependentUpon>
-    </Compile>
-    <Compile Include="Operations\ClippyOperationBuilder.cs" />
-    <Compile Include="Operations\DeleteChunkerOperation.cs" />
-    <Compile Include="Operations\InequalityReWriteOperation.cs" />
-    <Compile Include="Operations\IsNullReWriteOperation.cs" />
-    <Compile Include="Operations\OrdinalOrderByReWriteOperation.cs" />
-    <Compile Include="Operations\QueryCostOperations.cs" />
-    <Compile Include="Operations\ReWriterOperation.cs" />
-    <Compile Include="Operations\TableNameCorrectCaser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="OperationsBuilder.cs" />
-    <Compile Include="TagStore.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
     <None Include="Key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Page Include="MainWindow.xaml">
-      <Generator>MSBuild:Compile</Generator>
-      <SubType>Designer</SubType>
-    </Page>
-    <Page Include="MenuItem.xaml">
-      <SubType>Designer</SubType>
-      <Generator>MSBuild:Compile</Generator>
-    </Page>
-  </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Merge\src\SSDTDevPack.Indexes\SSDTDevPack.Rewriter.csproj">
-      <Project>{94813D75-0291-450F-A7BD-D3161FF4A2CB}</Project>
-      <Name>SSDTDevPack.Rewriter</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\SSDTDevPack.QueryCosts\SSDTDevPack.QueryCosts.csproj">
-      <Project>{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}</Project>
-      <Name>SSDTDevPack.QueryCosts</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/SSDTDevPack.Clippy/packages.config b/src/SSDTDevPack.Clippy/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/SSDTDevPack.Clippy/packages.config
+++ b/src/SSDTDevPack.Clippy/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.CodeCoverage/SSDTDevPack.CodeCoverage.csproj b/src/SSDTDevPack.CodeCoverage/SSDTDevPack.CodeCoverage.csproj
index 2c4b5e3..ebf6caf 100644
--- a/src/SSDTDevPack.CodeCoverage/SSDTDevPack.CodeCoverage.csproj
+++ b/src/SSDTDevPack.CodeCoverage/SSDTDevPack.CodeCoverage.csproj
@@ -67,6 +67,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -88,9 +104,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\SSDTDevPack.CCover\SSDTDevPack.CCover.csproj">
-      <Project>{F9577A2E-2D01-4419-979E-0A85A425C404}</Project>
-      <Name>SSDTDevPacl.CCover</Name>
+    <ProjectReference Include="..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
+      <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
+      <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/SSDTDevPack.CodeCoverage/packages.config b/src/SSDTDevPack.CodeCoverage/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/SSDTDevPack.CodeCoverage/packages.config
+++ b/src/SSDTDevPack.CodeCoverage/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.Extraction/SSDTDevPack.Extraction.csproj b/src/SSDTDevPack.Extraction/SSDTDevPack.Extraction.csproj
index baa3bd5..f88e075 100644
--- a/src/SSDTDevPack.Extraction/SSDTDevPack.Extraction.csproj
+++ b/src/SSDTDevPack.Extraction/SSDTDevPack.Extraction.csproj
@@ -73,6 +73,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -86,7 +102,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="CodeExtractor.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/SSDTDevPack.Extraction/packages.config b/src/SSDTDevPack.Extraction/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/SSDTDevPack.Extraction/packages.config
+++ b/src/SSDTDevPack.Extraction/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.Formatting/SSDTDevPack.Formatting.csproj b/src/SSDTDevPack.Formatting/SSDTDevPack.Formatting.csproj
index 5b26acd..72d7215 100644
--- a/src/SSDTDevPack.Formatting/SSDTDevPack.Formatting.csproj
+++ b/src/SSDTDevPack.Formatting/SSDTDevPack.Formatting.csproj
@@ -70,6 +70,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -82,7 +98,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="KeywordCaser.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
diff --git a/src/SSDTDevPack.Formatting/packages.config b/src/SSDTDevPack.Formatting/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/SSDTDevPack.Formatting/packages.config
+++ b/src/SSDTDevPack.Formatting/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.QueryCosts/SSDTDevPack.QueryCosts.csproj b/src/SSDTDevPack.QueryCosts/SSDTDevPack.QueryCosts.csproj
index 8837156..c12625b 100644
--- a/src/SSDTDevPack.QueryCosts/SSDTDevPack.QueryCosts.csproj
+++ b/src/SSDTDevPack.QueryCosts/SSDTDevPack.QueryCosts.csproj
@@ -77,9 +77,17 @@
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.12.0, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.8.0, Version=8.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="Microsoft.VisualStudio.Shell.Interop.9.0, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
     <Reference Include="Microsoft.VisualStudio.Text.Data, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -94,6 +102,10 @@
     <Reference Include="Microsoft.VisualStudio.Text.UI.Wpf, Version=12.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
@@ -110,15 +122,6 @@
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="DocumentScriptCosters.cs" />
-    <Compile Include="Highlighter\LowlightWordFormatDefinition.cs" />
-    <Compile Include="Highlighter\HighlightWordFormatDefinition.cs" />
-    <Compile Include="Highlighter\HighlightWordTag.cs" />
-    <Compile Include="Highlighter\HighlightWordTagger.cs" />
-    <Compile Include="Highlighter\HighlightWordTaggerProvider.cs" />
-    <Compile Include="Highlighter\LowlightWordTag.cs" />
-    <Compile Include="QueryCostRepository.cs" />
-    <Compile Include="ScriptCoster.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -126,10 +129,6 @@
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Merge\src\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{EF0F4A6D-68A4-4745-A3D5-2118A1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
     <ProjectReference Include="..\SSDTDevPack.CCover\SSDTDevPack.CCover.csproj">
       <Project>{F9577A2E-2D01-4419-979E-0A85A425C404}</Project>
       <Name>SSDTDevPacl.CCover</Name>
diff --git a/src/SSDTDevPack.QueryCosts/packages.config b/src/SSDTDevPack.QueryCosts/packages.config
index f167d7f..58ad3cf 100644
--- a/src/SSDTDevPack.QueryCosts/packages.config
+++ b/src/SSDTDevPack.QueryCosts/packages.config
@@ -2,4 +2,7 @@
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/SSDTDevPack.QuickDeploy/SSDTDevPack.QuickDeploy.csproj b/src/SSDTDevPack.QuickDeploy/SSDTDevPack.QuickDeploy.csproj
index 08b6d30..51a603a 100644
--- a/src/SSDTDevPack.QuickDeploy/SSDTDevPack.QuickDeploy.csproj
+++ b/src/SSDTDevPack.QuickDeploy/SSDTDevPack.QuickDeploy.csproj
@@ -70,6 +70,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
@@ -83,7 +99,6 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="QuickDeployer.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -96,10 +111,6 @@
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Merge\src\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{EF0F4A6D-68A4-4745-A3D5-2118A1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/SSDTDevPack.QuickDeploy/packages.config b/src/SSDTDevPack.QuickDeploy/packages.config
index 5a38fb8..58ad3cf 100644
--- a/src/SSDTDevPack.QuickDeploy/packages.config
+++ b/src/SSDTDevPack.QuickDeploy/packages.config
@@ -1,4 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file
diff --git a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/SSDTDevPack.Common.IntegrationTests.csproj b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/SSDTDevPack.Common.IntegrationTests.csproj
index bac81d4..37c7685 100644
--- a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/SSDTDevPack.Common.IntegrationTests.csproj
+++ b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/SSDTDevPack.Common.IntegrationTests.csproj
@@ -71,6 +71,26 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.15.0, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\..\..\..\Program Files (x86)\Microsoft Visual Studio\2017\Community\VSSDK\VisualStudioIntegration\Common\Assemblies\v4.0\Microsoft.VisualStudio.Shell.15.0.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
@@ -111,10 +131,6 @@
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Merge\src\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{EF0F4A6D-68A4-4745-A3D5-2118A1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/packages.config b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/packages.config
index 9173882..afbb7d4 100644
--- a/src/Test/Common/SSDTDevPack.Common.IntegrationTests/packages.config
+++ b/src/Test/Common/SSDTDevPack.Common.IntegrationTests/packages.config
@@ -1,5 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Test/Common/SSDTDevPack.Common.UnitTests/SSDTDevPack.Common.UnitTests.csproj b/src/Test/Common/SSDTDevPack.Common.UnitTests/SSDTDevPack.Common.UnitTests.csproj
index cc8c23f..86e714b 100644
--- a/src/Test/Common/SSDTDevPack.Common.UnitTests/SSDTDevPack.Common.UnitTests.csproj
+++ b/src/Test/Common/SSDTDevPack.Common.UnitTests/SSDTDevPack.Common.UnitTests.csproj
@@ -64,6 +64,22 @@
     <Reference Include="Microsoft.SqlServer.TransactSql.ScriptDom, Version=13.100.0.0, Culture=neutral, PublicKeyToken=89845dcd8080cc91, processorArchitecture=MSIL">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\Microsoft.SqlServer.TransactSql.ScriptDom.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.CoreUtility, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="Moq">
       <HintPath>..\..\..\Merge\src\SSDTDevPack.Merge\packages\Moq.4.2.1507.0118\lib\net40\Moq.dll</HintPath>
     </Reference>
@@ -97,10 +113,6 @@
       <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
       <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\Merge\src\SSDTDevPack.Indexes\SSDTDevPack.Rewriter.csproj">
-      <Project>{94813D75-0291-450F-A7BD-D3161FF4A2CB}</Project>
-      <Name>SSDTDevPack.Rewriter</Name>
-    </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/Test/Common/SSDTDevPack.Common.UnitTests/packages.config b/src/Test/Common/SSDTDevPack.Common.UnitTests/packages.config
index d60582a..1d110d3 100644
--- a/src/Test/Common/SSDTDevPack.Common.UnitTests/packages.config
+++ b/src/Test/Common/SSDTDevPack.Common.UnitTests/packages.config
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
   <package id="Moq" version="4.2.1507.0118" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
 </packages>
\ No newline at end of file
diff --git a/src/Test/Merge/WinFormHost.Merge/WinFormHost.Merge.csproj b/src/Test/Merge/WinFormHost.Merge/WinFormHost.Merge.csproj
index e2bb6d7..da36e27 100644
--- a/src/Test/Merge/WinFormHost.Merge/WinFormHost.Merge.csproj
+++ b/src/Test/Merge/WinFormHost.Merge/WinFormHost.Merge.csproj
@@ -85,12 +85,6 @@
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\Merge\src\SSDTDevPack.Merge\SSDTDevPack.Merge.csproj">
-      <Project>{ef0f4a6d-68a4-4745-a3d5-2118a1608721}</Project>
-      <Name>SSDTDevPack.Merge</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/src/Test/NameConstraints/NameConstraints.IntegrationTests/NameConstraints.IntegrationTests.csproj b/src/Test/NameConstraints/NameConstraints.IntegrationTests/NameConstraints.IntegrationTests.csproj
index 547920f..da764b4 100644
--- a/src/Test/NameConstraints/NameConstraints.IntegrationTests/NameConstraints.IntegrationTests.csproj
+++ b/src/Test/NameConstraints/NameConstraints.IntegrationTests/NameConstraints.IntegrationTests.csproj
@@ -59,9 +59,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\NameConstraints\src\SSDTDevPack.NameConstraints\SSDTDevPack.NameConstraints.csproj">
-      <Project>{289C1F12-3F83-4061-B88E-04493B015102}</Project>
-      <Name>SSDTDevPack.NameConstraints</Name>
+    <ProjectReference Include="..\..\..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
+      <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
+      <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/SSDTDevPack.QueryCosts.UnitTests.csproj b/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/SSDTDevPack.QueryCosts.UnitTests.csproj
index 427cca6..3f1947d 100644
--- a/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/SSDTDevPack.QueryCosts.UnitTests.csproj
+++ b/src/Test/QueryCost/SSDTDevPack.QueryCosts.UnitTests/SSDTDevPack.QueryCosts.UnitTests.csproj
@@ -56,9 +56,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\SSDTDevPack.QueryCosts\SSDTDevPack.QueryCosts.csproj">
-      <Project>{4B9FDC90-6AF3-4CE8-90DF-4B5FB854A357}</Project>
-      <Name>SSDTDevPack.QueryCosts</Name>
+    <ProjectReference Include="..\..\..\Common\src\SSDTDevPack.Common\SSDTDevPack.Common.csproj">
+      <Project>{D6638892-5597-40C3-916A-E020871F7077}</Project>
+      <Name>SSDTDevPack.Common</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/Parameter.cs b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/Parameter.cs
index 1caef53..ab3536e 100644
--- a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/Parameter.cs
+++ b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/Parameter.cs
@@ -1,4 +1,6 @@
-using Microsoft.SqlServer.Dac.Model;
+
+
+using Microsoft.SqlServer.Dac.Model;
 
 namespace SSDTDevPack.tSQLtStubber
 {
diff --git a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/SSDTDevPack.tSQLtStubber.csproj b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/SSDTDevPack.tSQLtStubber.csproj
index 1e1d5e1..d11deb4 100644
--- a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/SSDTDevPack.tSQLtStubber.csproj
+++ b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/SSDTDevPack.tSQLtStubber.csproj
@@ -81,6 +81,18 @@
       <HintPath>..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.CoreUtility.15.0.26201\lib\net45\Microsoft.VisualStudio.CoreUtility.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Microsoft.VisualStudio.OLE.Interop, Version=7.1.40304.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+      <HintPath>..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.OLE.Interop.7.10.6070\lib\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Shell.Framework, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Shell.Framework.15.0.26201\lib\net45\Microsoft.VisualStudio.Shell.Framework.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Microsoft.VisualStudio.Utilities, Version=15.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.VisualStudio.Utilities.15.0.26201\lib\net45\Microsoft.VisualStudio.Utilities.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="sqlpackage, Version=13.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\Merge\src\SSDTDevPack.Merge\packages\Microsoft.Data.Tools.Msbuild.10.0.61026\lib\net40\sqlpackage.exe</HintPath>
     </Reference>
diff --git a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/TestBuilder.cs b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/TestBuilder.cs
index f850017..111a44a 100644
--- a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/TestBuilder.cs
+++ b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/TestBuilder.cs
@@ -1,3 +1,14 @@
+
+
+
+
+
+
+
+
+
+
+
 using System;
 using System.Collections.Generic;
 using System.IO;
diff --git a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/packages.config b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/packages.config
index f167d7f..58ad3cf 100644
--- a/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/packages.config
+++ b/src/tSQLtStubber/SSDTDevPack.tSQLtStubber/packages.config
@@ -2,4 +2,7 @@
 <packages>
   <package id="Microsoft.Data.Tools.Msbuild" version="10.0.61026" targetFramework="net46" />
   <package id="Microsoft.VisualStudio.CoreUtility" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.OLE.Interop" version="7.10.6070" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Shell.Framework" version="15.0.26201" targetFramework="net46" />
+  <package id="Microsoft.VisualStudio.Utilities" version="15.0.26201" targetFramework="net46" />
 </packages>
\ No newline at end of file