diff --git a/src/EditorFeatures/CSharpTest/MoveToNamespace/MoveToNamespaceTests.cs b/src/EditorFeatures/CSharpTest/MoveToNamespace/MoveToNamespaceTests.cs
new file mode 100644
index 0000000000000000000000000000000000000000..559c7e6c411fa27fdfea16ee70f9bd9f241cdc0f
--- /dev/null
+++ b/src/EditorFeatures/CSharpTest/MoveToNamespace/MoveToNamespaceTests.cs
@@ -0,0 +1,225 @@
+// Copyright(c) Microsoft.All Rights Reserved.Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Test.Utilities;
+using Microsoft.CodeAnalysis.Test.Utilities.MoveToNamespace;
+using Roslyn.Test.Utilities;
+using Xunit;
+
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.MoveToNamespace
+{
+    public class MoveToNamespaceTests : AbstractMoveToNamespaceTests
+    {
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_CaretOnNamespaceName()
+        {
+            var markup = @"
+using System;
+
+namespace A$$ 
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+}";
+
+            var expectedMarkup = @"
+using System;
+
+namespace B
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: true,
+                expectedNamespace: "B",
+                expectedMarkup: expectedMarkup);
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_CaretOnNamespaceKeyword()
+        {
+            var markup = @"
+using System;
+
+namespace$$ A
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+}";
+
+            var expectedMarkup = @"
+using System;
+
+namespace B
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: true,
+                expectedNamespace: "B",
+                expectedMarkup: expectedMarkup);
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_CaretOnNamespaceNameMultipleDeclarations()
+        {
+            var markup = @"
+using System;
+
+namespace A$$ 
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+
+    class MyOtherClass
+    {
+        void Method() { }
+    }
+}";
+
+            var expectedMarkup = @"
+using System;
+
+namespace B
+{
+    class MyClass
+    {
+        void Method() { }
+    }
+
+    class MyOtherClass
+    {
+        void Method() { }
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: true,
+                expectedNamespace: "B",
+                expectedMarkup: expectedMarkup);
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_CaretOnTypeDeclaration()
+        {
+            var markup = @"
+using System;
+namespace A 
+{
+    class MyClass$$ 
+    {
+        void Method() {}
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: false);
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_WithVariousSymbols()
+        {
+            var markup = @"
+using System;
+
+namespace A$$ 
+{
+    public delegate void MyDelegate();
+
+    public enum MyEnum
+    {
+        One,
+        Two,
+        Three
+    }
+
+    public struct MyStruct
+    { }
+
+    public interface MyInterface
+    { }
+
+    class MyClass
+    {
+        void Method() { }
+    }
+
+    class MyOtherClass
+    {
+        void Method() { }
+    }
+}";
+
+            var expectedMarkup = @"
+using System;
+
+namespace B
+{
+    public delegate void MyDelegate();
+
+    public enum MyEnum
+    {
+        One,
+        Two,
+        Three
+    }
+
+    public struct MyStruct
+    { }
+
+    public interface MyInterface
+    { }
+
+    class MyClass
+    {
+        void Method() { }
+    }
+
+    class MyOtherClass
+    {
+        void Method() { }
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: true,
+                expectedNamespace: "B",
+                expectedMarkup: expectedMarkup);
+        }
+
+        [WpfFact, Trait(Traits.Feature, Traits.Features.MoveToNamespace)]
+        public async Task MoveToNamespace_NestedNamespace()
+        {
+            var markup = @"
+using System;
+
+namespace A$$
+{
+    namespace C 
+    {
+        class MyClass
+        {
+            void Method() { }
+        }
+    }
+}";
+            await TestMoveToNamespaceCommandCSharpAsync(
+                markup,
+                expectedSuccess: false);
+        }
+    }
+}
diff --git a/src/EditorFeatures/TestUtilities/MoveToNamespace/AbstractMoveToNamespaceTests.cs b/src/EditorFeatures/TestUtilities/MoveToNamespace/AbstractMoveToNamespaceTests.cs
new file mode 100644
index 0000000000000000000000000000000000000000..239a60e0978eff9827bd59301992daf3128cb2e2
--- /dev/null
+++ b/src/EditorFeatures/TestUtilities/MoveToNamespace/AbstractMoveToNamespaceTests.cs
@@ -0,0 +1,146 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp;
+using Microsoft.CodeAnalysis.CSharp.AddImports;
+using Microsoft.CodeAnalysis.CSharp.ChangeNamespace;
+using Microsoft.CodeAnalysis.CSharp.MoveToNamespace;
+using Microsoft.CodeAnalysis.CSharp.RemoveUnnecessaryImports;
+using Microsoft.CodeAnalysis.Editor.UnitTests;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Extensions;
+using Microsoft.CodeAnalysis.Editor.UnitTests.Workspaces;
+using Microsoft.CodeAnalysis.MoveToNamespace;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.VisualStudio.Composition;
+using Xunit;
+using static Microsoft.CodeAnalysis.Editor.UnitTests.CodeActions.AbstractCodeActionOrUserDiagnosticTest;
+
+namespace Microsoft.CodeAnalysis.Test.Utilities.MoveToNamespace
+{
+    [UseExportProvider]
+    public abstract class AbstractMoveToNamespaceTests
+    {
+        private static readonly IExportProviderFactory CSharpExportProviderFactory =
+            ExportProviderCache.GetOrCreateExportProviderFactory(
+                TestExportProvider.MinimumCatalogWithCSharpAndVisualBasic
+                    .WithPart(typeof(TestMoveToNamespaceOptionsService))
+                    .WithPart(typeof(CSharpMoveToNamespaceService))
+                    .WithPart(typeof(CSharpChangeNamespaceService))
+                    .WithPart(typeof(Experiments.DefaultExperimentationService))
+                    .WithPart(typeof(CSharpAddImportsService))
+                    .WithPart(typeof(CSharpRemoveUnnecessaryImportsService)));
+
+        public static Task TestMoveToNamespaceCommandCSharpAsync(
+            string markup,
+            bool expectedSuccess,
+            string expectedNamespace = null,
+            string expectedMarkup = null)
+        {
+            return TestMoveToNamespaceCommandAsync(
+                markup,
+                expectedSuccess,
+                LanguageNames.CSharp,
+                expectedNamespace: expectedNamespace,
+                expectedMarkup: expectedMarkup);
+        }
+
+        public static Task TestMoveToNamespaceCommandVisualBasicAsync(
+            string markup,
+            bool expectedSuccess,
+            string expectedNamespace = null,
+            string expectedMarkup = null)
+        {
+            return TestMoveToNamespaceCommandAsync(
+                markup,
+                expectedSuccess,
+                LanguageNames.VisualBasic,
+                expectedNamespace: expectedNamespace,
+                expectedMarkup: expectedMarkup);
+        }
+
+
+        public static async Task TestMoveToNamespaceCommandAsync(
+            string markup,
+            bool expectedSuccess,
+            string languageName,
+            string expectedNamespace = null,
+            string expectedMarkup = null,
+            CompilationOptions compilationOptions = null)
+        {
+            expectedNamespace = expectedNamespace ?? string.Empty;
+            var parameters = new TestParameters();
+            using (var workspace = CreateWorkspace(markup, languageName, compilationOptions, parameters))
+            {
+                var testDocument = workspace.Documents.Single(d => d.CursorPosition.HasValue);
+                var document = workspace.CurrentSolution.GetDocument(testDocument.Id);
+
+                var result = await MoveViaCommandAsync(testDocument, document, expectedNamespace);
+
+                if (expectedSuccess)
+                {
+                    Assert.True(result.Succeeded);
+                    Assert.NotNull(result.UpdatedSolution);
+                    Assert.NotNull(result.UpdatedDocumentId);
+
+                    if (expectedMarkup != null)
+                    {
+                        var updatedDocument = result.UpdatedSolution.GetDocument(result.UpdatedDocumentId);
+                        var updatedText = await updatedDocument.GetTextAsync().ConfigureAwait(false);
+                        Assert.Equal(expectedMarkup, updatedText.ToString());
+                    }
+                }
+                else
+                {
+                    Assert.False(result.Succeeded);
+                }
+            }
+        }
+
+        private static TestWorkspace CreateWorkspace(
+            string markup,
+            string languageName,
+            CompilationOptions compilationOptions,
+            TestParameters parameters)
+        {
+            var exportProviderFactory = GetExportProviderFactory(languageName);
+            var exportProvider = exportProviderFactory.CreateExportProvider();
+
+            var workspace = languageName == LanguageNames.CSharp
+                ? TestWorkspace.CreateCSharp(markup, exportProvider: exportProvider, compilationOptions: compilationOptions as CSharpCompilationOptions)
+                : TestWorkspace.CreateVisualBasic(markup, exportProvider: exportProvider, compilationOptions: compilationOptions);
+
+            workspace.ApplyOptions(parameters.options);
+
+            return workspace;
+        }
+
+        private static IExportProviderFactory GetExportProviderFactory(string languageName)
+        {
+            return languageName == LanguageNames.CSharp
+                ? CSharpExportProviderFactory
+                : throw new InvalidOperationException("VB is not currently supported");
+        }
+
+        private static async Task<MoveToNamespaceResult> MoveViaCommandAsync(
+            TestHostDocument testDocument,
+            Document document,
+            string newNamespace)
+        {
+            var cancellationToken = CancellationToken.None;
+            var moveToNamespaceService = document.GetLanguageService<AbstractMoveToNamespaceService>();
+
+            var analysisResult = await moveToNamespaceService.AnalyzeTypeAtPositionAsync(
+                document,
+                testDocument.CursorPosition.Value,
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+
+            return await moveToNamespaceService.MoveToNamespaceAsync(
+                analysisResult,
+                newNamespace,
+                cancellationToken: cancellationToken).ConfigureAwait(false);
+        }
+    }
+}
diff --git a/src/EditorFeatures/TestUtilities/MoveToNamespace/TestMoveToNamespaceOptionsService.cs b/src/EditorFeatures/TestUtilities/MoveToNamespace/TestMoveToNamespaceOptionsService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..601e1a5132a085e5fe02963056ca14d04c083817
--- /dev/null
+++ b/src/EditorFeatures/TestUtilities/MoveToNamespace/TestMoveToNamespaceOptionsService.cs
@@ -0,0 +1,33 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+extern alias WORKSPACES;
+
+using System;
+using System.ComponentModel.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.MoveToNamespace;
+using Microsoft.CodeAnalysis.Notification;
+using WORKSPACES::Microsoft.CodeAnalysis.Host.Mef;
+
+namespace Microsoft.CodeAnalysis.Test.Utilities.MoveToNamespace
+{
+    [Export(typeof(IMoveToNamespaceOptionsService))]
+    [PartNotDiscoverable]
+    class TestMoveToNamespaceOptionsService : IMoveToNamespaceOptionsService
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public TestMoveToNamespaceOptionsService()
+        {
+        }
+
+        public Task<MoveToNamespaceOptionsResult> GetChangeNamespaceOptionsAsync(ISyntaxFactsService syntaxFactsService, INotificationService notificationService, string defaultNamespace, CancellationToken cancellationToken)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}
diff --git a/src/Features/CSharp/Portable/MoveToNamespace/CSharpMoveToNamespaceService.cs b/src/Features/CSharp/Portable/MoveToNamespace/CSharpMoveToNamespaceService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f063d877f7295a25408ab598f377a92e102514be
--- /dev/null
+++ b/src/Features/CSharp/Portable/MoveToNamespace/CSharpMoveToNamespaceService.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Composition;
+using Microsoft.CodeAnalysis.CSharp.Syntax;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.MoveToNamespace;
+
+namespace Microsoft.CodeAnalysis.CSharp.MoveToNamespace
+{
+    [ExportLanguageService(typeof(AbstractMoveToNamespaceService), LanguageNames.CSharp), Shared]
+    internal class CSharpMoveToNamespaceService :
+        AbstractMoveToNamespaceService<CompilationUnitSyntax, NamespaceDeclarationSyntax>
+    {
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public CSharpMoveToNamespaceService(IMoveToNamespaceOptionsService moveToNamespaceOptionsService)
+            : base(moveToNamespaceOptionsService)
+        {
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
index e707f03e150328a4fb7e63bfa566a553a803c06f..1d06ba94c0bc359ea970b77f4eceb0f9efc481db 100644
--- a/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
+++ b/src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs
@@ -28,6 +28,7 @@ internal static class PredefinedCodeRefactoringProviderNames
         public const string MergeConsecutiveIfStatements = "Merge Consecutive If Statements Code Action Provider";
         public const string MergeNestedIfStatements = "Merge Nested If Statements Code Action Provider";
         public const string MoveDeclarationNearReference = "Move Declaration Near Reference Code Action Provider";
+        public const string MoveToNamespace = "Move To Namespace Code Action Provider";
         public const string MoveTypeToFile = "Move Type To File Code Action Provider";
         public const string PullMemberUp = "Pull Member Up Code Action Provider";
         public const string ReplaceDocCommentTextWithTag = "Replace Documentation Comment Text With Tag Code Action Provider";
diff --git a/src/Features/Core/Portable/FeaturesResources.Designer.cs b/src/Features/Core/Portable/FeaturesResources.Designer.cs
index d4d86c2862e2efd1b2ae6832cd1967a455610c76..036747852249758a0387e47f46775db17a051527 100644
--- a/src/Features/Core/Portable/FeaturesResources.Designer.cs
+++ b/src/Features/Core/Portable/FeaturesResources.Designer.cs
@@ -2624,6 +2624,15 @@ internal class FeaturesResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Move to namespace....
+        /// </summary>
+        internal static string Move_to_namespace {
+            get {
+                return ResourceManager.GetString("Move_to_namespace", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Move type to {0}.
         /// </summary>
diff --git a/src/Features/Core/Portable/FeaturesResources.resx b/src/Features/Core/Portable/FeaturesResources.resx
index 8b235dc060efb226a87cfd1909801be025344af1..52227cb5509c6e191630fdffa4acfc6261b0cca9 100644
--- a/src/Features/Core/Portable/FeaturesResources.resx
+++ b/src/Features/Core/Portable/FeaturesResources.resx
@@ -1457,6 +1457,9 @@ This version used in: {2}</value>
   <data name="Move_file_to_project_root_folder" xml:space="preserve">
     <value>Move file to project root folder</value>
   </data>
+  <data name="Move_to_namespace" xml:space="preserve">
+    <value>Move to namespace...</value>
+  </data>
   <data name="Change_to_global_namespace" xml:space="preserve">
     <value>Change to global namespace</value>
   </data>
diff --git a/src/Features/Core/Portable/MoveToNamespace/AbstractMoveToNamespaceService.cs b/src/Features/Core/Portable/MoveToNamespace/AbstractMoveToNamespaceService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..24a3fa5fdb1341a8bd9a454d28e9f31086ee2245
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/AbstractMoveToNamespaceService.cs
@@ -0,0 +1,123 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.ChangeNamespace;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Notification;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+using Microsoft.CodeAnalysis.Text;
+using Roslyn.Utilities;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal abstract class AbstractMoveToNamespaceService : ILanguageService
+    {
+        internal abstract Task<ImmutableArray<MoveToNamespaceCodeAction>> GetCodeActionsAsync(Document document, TextSpan span, CancellationToken cancellationToken);
+        internal abstract Task<MoveToNamespaceAnalysisResult> AnalyzeTypeAtPositionAsync(Document document, int position, CancellationToken cancellationToken);
+        public abstract Task<MoveToNamespaceResult> MoveToNamespaceAsync(MoveToNamespaceAnalysisResult analysisResult, string targetNamespace, CancellationToken cancellationToken);
+        public abstract MoveToNamespaceOptionsResult GetOptions(Document document, string defaultNamespace, CancellationToken cancellationToken);
+    }
+
+    internal abstract class AbstractMoveToNamespaceService<TCompilationSyntax, TNamespaceDeclarationSyntax>
+        : AbstractMoveToNamespaceService
+    {
+        private IMoveToNamespaceOptionsService _moveToNamespaceOptionsService;
+
+        public AbstractMoveToNamespaceService(IMoveToNamespaceOptionsService moveToNamespaceOptionsService)
+        {
+            _moveToNamespaceOptionsService = moveToNamespaceOptionsService;
+        }
+
+        internal override async Task<ImmutableArray<MoveToNamespaceCodeAction>> GetCodeActionsAsync(
+            Document document,
+            TextSpan span,
+            CancellationToken cancellationToken)
+        {
+            var typeAnalysisResult = await AnalyzeTypeAtPositionAsync(document, span.Start, cancellationToken).ConfigureAwait(false);
+
+            return typeAnalysisResult.CanPerform
+                ? ImmutableArray.Create(new MoveToNamespaceCodeAction(this, typeAnalysisResult))
+                : ImmutableArray<MoveToNamespaceCodeAction>.Empty;
+        }
+
+        internal override async Task<MoveToNamespaceAnalysisResult> AnalyzeTypeAtPositionAsync(
+            Document document,
+            int position,
+            CancellationToken cancellationToken)
+        {
+            var root = await document.GetSyntaxRootAsync().ConfigureAwait(false);
+            var semanticModel = await document.GetSemanticModelAsync(cancellationToken).ConfigureAwait(false);
+
+            var token = root.FindToken(position);
+            var node = token.Parent;
+
+            var symbolInfo = semanticModel.GetSymbolInfo(node, cancellationToken: cancellationToken);
+            var symbol = symbolInfo.Symbol;
+
+            if (symbol is INamespaceSymbol namespaceSymbol)
+            {
+                node = node.FirstAncestorOrSelf<SyntaxNode>(a => a is TNamespaceDeclarationSyntax);
+            }
+
+            if (node is TNamespaceDeclarationSyntax declarationSyntax)
+            {
+                if (ContainsNamespaceDeclaration(node))
+                {
+                    return new MoveToNamespaceAnalysisResult("Container contains nested namespace declaration");
+                }
+
+                return new MoveToNamespaceAnalysisResult(document, node, declarationSyntax.GetTypeDisplayName());
+            }
+
+            return new MoveToNamespaceAnalysisResult("Not a valid position");
+        }
+
+        private bool ContainsNamespaceDeclaration(SyntaxNode node)
+            => node.DescendantNodes(n => n is TCompilationSyntax || n is TNamespaceDeclarationSyntax)
+                        .OfType<TNamespaceDeclarationSyntax>().Any();
+
+        public override async Task<MoveToNamespaceResult> MoveToNamespaceAsync(
+            MoveToNamespaceAnalysisResult analysisResult,
+            string targetNamespace,
+            CancellationToken cancellationToken)
+        {
+            if (!analysisResult.CanPerform)
+            {
+                return MoveToNamespaceResult.Failed;
+            }
+
+            var changeNamespaceService = analysisResult.Document.GetLanguageService<IChangeNamespaceService>();
+            if (changeNamespaceService == null)
+            {
+                return MoveToNamespaceResult.Failed;
+            }
+
+            var changedSolution = await changeNamespaceService.ChangeNamespaceAsync(
+                analysisResult.Document,
+                analysisResult.Container,
+                targetNamespace,
+                cancellationToken).ConfigureAwait(false);
+
+            return new MoveToNamespaceResult(changedSolution, analysisResult.Document.Id);
+        }
+
+        public override MoveToNamespaceOptionsResult GetOptions(
+            Document document,
+            string defaultNamespace,
+            CancellationToken cancellationToken)
+        {
+            var syntaxFactsService = document.GetLanguageService<ISyntaxFactsService>();
+            var notificationService = document.Project.Solution.Workspace.Services.GetService<INotificationService>();
+
+            return _moveToNamespaceOptionsService.GetChangeNamespaceOptionsAsync(
+                syntaxFactsService,
+                notificationService,
+                defaultNamespace,
+                cancellationToken).WaitAndGetResult(cancellationToken);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/IMoveToNamespaceOptionsService.cs b/src/Features/Core/Portable/MoveToNamespace/IMoveToNamespaceOptionsService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f0d3647768b8fddd87fe1245c80e8ac1ab7334df
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/IMoveToNamespaceOptionsService.cs
@@ -0,0 +1,22 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Text;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Host;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.Notification;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal interface IMoveToNamespaceOptionsService : IWorkspaceService
+    {
+        Task<MoveToNamespaceOptionsResult> GetChangeNamespaceOptionsAsync(
+            ISyntaxFactsService syntaxFactsService,
+            INotificationService notificationService,
+            string defaultNamespace,
+            CancellationToken cancellationToken);
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceAnalysisResult.cs b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceAnalysisResult.cs
new file mode 100644
index 0000000000000000000000000000000000000000..548871f20acf76da655f4830e865f4c431f3392c
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceAnalysisResult.cs
@@ -0,0 +1,35 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Collections.Generic;
+using System.Collections.Immutable;
+using System.Text;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal class MoveToNamespaceAnalysisResult
+    {
+        public bool CanPerform { get; }
+        public Document Document { get; }
+        public string ErrorMessage { get; }
+        public SyntaxNode Container { get; }
+        public string OriginalNamespace { get; }
+
+        public MoveToNamespaceAnalysisResult(
+            Document document,
+            SyntaxNode container,
+            string originalNamespace)
+        {
+            CanPerform = true;
+            Document = document;
+            Container = container;
+            OriginalNamespace = originalNamespace;
+        }
+
+        public MoveToNamespaceAnalysisResult(string errorMessage)
+        {
+            CanPerform = false;
+            ErrorMessage = errorMessage;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeAction.cs b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeAction.cs
new file mode 100644
index 0000000000000000000000000000000000000000..0ab67374c8b2ac997c22eadfc5bd78a5130acc7b
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeAction.cs
@@ -0,0 +1,54 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeActions;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal class MoveToNamespaceCodeAction : CodeActionWithOptions
+    {
+        private readonly AbstractMoveToNamespaceService _changeNamespaceService;
+        private readonly MoveToNamespaceAnalysisResult _moveToNamespaceAnalysisResult;
+
+        public override string Title => FeaturesResources.Move_to_namespace;
+
+        public MoveToNamespaceCodeAction(AbstractMoveToNamespaceService changeNamespaceService, MoveToNamespaceAnalysisResult analysisResult)
+        {
+            _changeNamespaceService = changeNamespaceService;
+            _moveToNamespaceAnalysisResult = analysisResult;
+        }
+
+        public override object GetOptions(CancellationToken cancellationToken)
+        {
+            return _changeNamespaceService.GetOptions(
+                _moveToNamespaceAnalysisResult.Document,
+                _moveToNamespaceAnalysisResult.OriginalNamespace,
+                cancellationToken);
+        }
+
+        protected override async Task<IEnumerable<CodeActionOperation>> ComputeOperationsAsync(object options, CancellationToken cancellationToken)
+        {
+            IEnumerable<CodeActionOperation> operations = null;
+
+            if (options is MoveToNamespaceOptionsResult moveToNamespaceOptions && !moveToNamespaceOptions.IsCancelled)
+            {
+                var moveToNamespaceResult = await _changeNamespaceService.MoveToNamespaceAsync(
+                    _moveToNamespaceAnalysisResult,
+                    moveToNamespaceOptions.Namespace,
+                    cancellationToken).ConfigureAwait(false);
+
+                if (moveToNamespaceResult.Succeeded)
+                {
+                    operations = new CodeActionOperation[]
+                    {
+                        new ApplyChangesOperation(moveToNamespaceResult.UpdatedSolution)
+                    };
+                }
+            }
+
+            return operations;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeActionProvider.cs b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeActionProvider.cs
new file mode 100644
index 0000000000000000000000000000000000000000..52f7da29f4d68bab4347c5893f73c9ffe7156c36
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceCodeActionProvider.cs
@@ -0,0 +1,20 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Composition;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CodeRefactorings;
+using Microsoft.CodeAnalysis.Shared.Extensions;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    [ExportCodeRefactoringProvider(LanguageNames.CSharp, Name = PredefinedCodeRefactoringProviderNames.MoveToNamespace), Shared]
+    internal class MoveToNamespaceCodeActionProvider : CodeRefactoringProvider
+    {
+        public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
+        {
+            var service = context.Document.GetLanguageService<AbstractMoveToNamespaceService>();
+            var actions = await service.GetCodeActionsAsync(context.Document, context.Span, context.CancellationToken).ConfigureAwait(false);
+            context.RegisterRefactorings(actions);
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceOptionsResult.cs b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceOptionsResult.cs
new file mode 100644
index 0000000000000000000000000000000000000000..a654927ce4c50fecd4830856000a82356b06dcbe
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceOptionsResult.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Collections.Immutable;
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal class MoveToNamespaceOptionsResult
+    {
+        public static readonly MoveToNamespaceOptionsResult Cancelled = new MoveToNamespaceOptionsResult(isCancelled: true);
+
+        public bool IsCancelled { get; }
+        public string Namespace { get; }
+
+        public MoveToNamespaceOptionsResult(bool isCancelled)
+        {
+            IsCancelled = true;
+        }
+
+        public MoveToNamespaceOptionsResult(string @namespace)
+        {
+            Namespace = @namespace;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceResult.cs b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceResult.cs
new file mode 100644
index 0000000000000000000000000000000000000000..9089a91f47500ee37fc0a9f444bccbf161d40719
--- /dev/null
+++ b/src/Features/Core/Portable/MoveToNamespace/MoveToNamespaceResult.cs
@@ -0,0 +1,25 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+namespace Microsoft.CodeAnalysis.MoveToNamespace
+{
+    internal class MoveToNamespaceResult
+    {
+        public static MoveToNamespaceResult Failed = new MoveToNamespaceResult(succeeded: false);
+
+        public bool Succeeded { get; }
+        public Solution UpdatedSolution { get; }
+        public DocumentId UpdatedDocumentId { get; }
+
+        public MoveToNamespaceResult(Solution solution, DocumentId updatedDocumentId)
+        {
+            UpdatedSolution = solution;
+            UpdatedDocumentId = updatedDocumentId;
+            Succeeded = true;
+        }
+
+        private MoveToNamespaceResult(bool succeeded)
+        {
+            Succeeded = succeeded;
+        }
+    }
+}
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
index 1e37a709778ba2f07849a5a834ef4d6d4cd55acd..8359ac8bf35610b452a910e213874fcabd4d2500 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.cs.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Přesunout soubor do kořenové složky projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Soukromý člen {0} se může odebrat, jak jeho přiřazená hodnota se nikdy nečte.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
index f930afd7411a4d3c01a90844190d0e81dbd67a5c..7651088cc12006092c97e4eabb37ec4616691e69 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.de.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Datei in den Stammordner des Projekts verschieben</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Der private Member "{0}" kann entfernt werden, da der zugewiesene Wert nie gelesen wird.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
index 7dcba2a02e39cb334c6265df3051d34e0fdadafd..f2eda71dc102ab38959aa0bc14ab15c69f0cfbfd 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.es.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Mover el archivo a la carpeta raíz del proyecto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Un miembro privado "{0}" puede retirarse porque el valor asignado a él no se lee nunca.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
index f01bbd3b0c1968ce7c1ac42edfd33043d4bdce26..fd0fcbfedf989a347c8c2174cae7003ccaba4e4a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.fr.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Déplacer le fichier dans le dossier racine du projet</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Vous pouvez supprimer le membre privé '{0}', car la valeur qui lui est attribuée n'est jamais lue.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
index 899d62dfe52a531bd24d540b12b6a6df83971c80..10d20905960372af3a1ca9e31e5d4e14b3f2776f 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.it.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Sposta il file nella cartella radice del progetto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">È possibile rimuovere il membro privato '{0}' perché il valore assegnato ad esso non viene mai letto.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
index b0a698594f4650316f510af7c46d283fa03fab77..e5317b1231f13597359dc307d9e375b43f7b239e 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ja.xlf
@@ -212,6 +212,11 @@
         <target state="translated">ファイルをプロジェクト ルート フォルダーに移動します</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">割り当てられている値が読み取られることがないようにプライベートメンバー '{0}' を削除できます。</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
index 3c52d4081147f0debfb25568723754908d044ef3..a90fb97b914cd36c106afabdb67c141867cfb510 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ko.xlf
@@ -212,6 +212,11 @@
         <target state="translated">파일을 프로젝트 루트 폴더로 이동</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Private 멤버 '{0}'에 할당된 값을 읽을 수 없으므로 이 멤버를 제거할 수 있습니다.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
index 5a808972a17f2a9cca0429ab28d40aacde3d2d31..158eae37a60b3d3d9aca4d262ca045bb857c1321 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pl.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Przenieś plik do folderu głównego projektu</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Prywatną składową „{0}” można usunąć, ponieważ przypisana do niej wartość nie jest nigdy odczytywana.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
index f5a248a624651247965a75051d2a2ebd8b77fb50..e99186238cafeed7277b746a196b14b63bb75fe8 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.pt-BR.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Mover o arquivo para a pasta raiz do projeto</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">O membro particular '{0}' pode ser removido pois o valor atribuído a ele nunca é lido.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
index 2cda232be56b7871449c169e1feb0327d2b52f52..1543d3f1116352487110e1a0301aeb0f5ce71f1a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.ru.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Переместить файл в корневую папку проекта</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Закрытый член «{0}» может быть удален как значение, присвоенное него никогда не читал.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
index 83eb09066ef6bd2d0770158929b3ec6e968290e3..4e5eaf5b9d8aa5ccb960ebf6b6cc1761064fde4e 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.tr.xlf
@@ -212,6 +212,11 @@
         <target state="translated">Dosyayı proje kök klasörüne taşı</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">Kendisine atanmış değeri hiç okurken özel üye '{0}'-ebilmek var olmak çıkarmak.</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
index 3a1aadd49a7f187346fb3905176aacb8e7a94ccb..e6996ca59e4d1cab4273205df888975779128bd8 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hans.xlf
@@ -212,6 +212,11 @@
         <target state="translated">将文件移动到项目根文件夹</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">可删除私有成员“{0}”，因为永不会读取分配给它的值。</target>
diff --git a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
index 9be4328ef39fd2061eb19631f916521dc715d934..9dcfd2e74a44b42cd182208edae51f288da8039a 100644
--- a/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
+++ b/src/Features/Core/Portable/xlf/FeaturesResources.zh-Hant.xlf
@@ -212,6 +212,11 @@
         <target state="translated">將檔案移到專案根資料夾</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move to namespace...</source>
+        <target state="new">Move to namespace...</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Private_member_0_can_be_removed_as_the_value_assigned_to_it_is_never_read">
         <source>Private member '{0}' can be removed as the value assigned to it is never read.</source>
         <target state="translated">因為永遠不會讀取指派給私用成員 '{0}' 的值，所以可移除該成員。</target>
diff --git a/src/Test/Utilities/Portable/Traits/Traits.cs b/src/Test/Utilities/Portable/Traits/Traits.cs
index 1726c951f31f231101a2c0900a14902bbfb668d3..b5da3351f74003707e76ff862fa96f59069b1fbf 100644
--- a/src/Test/Utilities/Portable/Traits/Traits.cs
+++ b/src/Test/Utilities/Portable/Traits/Traits.cs
@@ -215,6 +215,7 @@ public static class Features
             public const string LinkedFileDiffMerging = nameof(LinkedFileDiffMerging);
             public const string MetadataAsSource = nameof(MetadataAsSource);
             public const string MSBuildWorkspace = nameof(MSBuildWorkspace);
+            public const string MoveToNamespace = nameof(MoveToNamespace);
             public const string NamingStyle = nameof(NamingStyle);
             public const string NavigableSymbols = nameof(NavigableSymbols);
             public const string NavigateTo = nameof(NavigateTo);
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml
new file mode 100644
index 0000000000000000000000000000000000000000..19866d45f772d37192839061386edc79fc726b0c
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml
@@ -0,0 +1,70 @@
+<vs:DialogWindow x:Uid="MoveToNamespaceDialog"
+             x:Class="Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace.MoveToNamespaceDialog"
+             x:ClassModifier="internal"
+             x:Name="dialog"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+             xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+             xmlns:local="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace"
+             xmlns:vs="clr-namespace:Microsoft.VisualStudio.PlatformUI;assembly=Microsoft.VisualStudio.Shell.15.0"
+             xmlns:u="clr-namespace:Microsoft.VisualStudio.LanguageServices.Implementation.Utilities"
+             mc:Ignorable="d" 
+             d:DesignHeight="140" d:DesignWidth="460"
+             Height="140" Width="460"
+             MinHeight="140" MinWidth="460"
+             Title="{Binding ElementName=dialog, Path=MoveToNamespaceDialogTitle}"
+             HasHelpButton="True"
+             FocusManager.FocusedElement="{Binding ElementName=interfaceNameTextBox}"
+             ResizeMode="CanResizeWithGrip"
+             ShowInTaskbar="False"
+             HasDialogFrame="True"
+             WindowStartupLocation="CenterOwner">
+
+    <Window.Resources>
+        <Thickness x:Key="labelPadding">0, 5, 0, 2</Thickness>
+        <Thickness x:Key="textboxPadding">2</Thickness>
+    </Window.Resources>
+
+    <Grid Margin="11,6,11,11">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
+        <StackPanel Grid.Row="0">
+            <Label x:Uid="NamespaceLabel" 
+                   x:Name="NamespaceLabel"
+                   Content="{Binding ElementName=dialog, Path=NamespaceLabelText}"
+                   Padding="{StaticResource ResourceKey=labelPadding}"
+                   Target="{Binding ElementName=NamespaceTextBox}" />
+            <TextBox x:Uid="NamespaceTextBox"
+                     Name="NamespaceTextBox"
+                     AutomationProperties.LabeledBy="{Binding ElementName=NamespaceLabel}"
+                     Text="{Binding NamespaceName, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+                     Padding="{StaticResource ResourceKey=textboxPadding}"
+                     GotFocus="SelectAllInTextBox" />
+        </StackPanel>
+
+        <StackPanel Grid.Row="1" 
+                    HorizontalAlignment="Right" 
+                    Margin="0, 11, 0, 0"
+                    Orientation="Horizontal">
+            <Button x:Uid="OkButton" 
+                    Content="{Binding ElementName=dialog, Path=OK}" 
+                    Margin="0, 0, 0, 0" 
+                    Padding="9,2,9,2"
+                    Click="OK_Click" 
+                    IsDefault="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
+            <Button x:Uid="CancelButton" 
+                    Content="{Binding ElementName=dialog, Path=Cancel}"
+                    Margin="7, 0, 0, 0" 
+                    Padding="9,2,9,2"
+                    Click="Cancel_Click"
+                    IsCancel="True"
+                    MinWidth="73"
+                    MinHeight="21"/>
+        </StackPanel>
+    </Grid>
+</vs:DialogWindow>
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml.cs b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml.cs
new file mode 100644
index 0000000000000000000000000000000000000000..540d0f9449bf4cede44216e2c4ef81188697c5e8
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialog.xaml.cs
@@ -0,0 +1,49 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Input;
+using Microsoft.VisualStudio.PlatformUI;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace
+{
+    /// <summary>
+    /// Interaction logic for MoveToNamespaceDialog.xaml
+    /// </summary>
+    internal partial class MoveToNamespaceDialog : DialogWindow
+    {
+        private readonly MoveToNamespaceDialogViewModel _viewModel;
+
+        public string MoveToNamespaceDialogTitle => ServicesVSResources.Move_to_namespace;
+        public string NamespaceLabelText => ServicesVSResources.Namespace_colon;
+        public string OK => ServicesVSResources.OK;
+        public string Cancel => ServicesVSResources.Cancel;
+
+        internal MoveToNamespaceDialog(MoveToNamespaceDialogViewModel viewModel)
+            : base(helpTopic: "vs.csharp.refactoring.movetonamespace")
+        {
+            _viewModel = viewModel;
+
+            InitializeComponent();
+            DataContext = viewModel;
+        }
+
+        private void SelectAllInTextBox(object sender, RoutedEventArgs e)
+        {
+            if (e.OriginalSource is TextBox textbox && Mouse.LeftButton == MouseButtonState.Released)
+            {
+                textbox.SelectAll();
+            }
+        }
+
+        private void Cancel_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = false;
+        }
+
+        private void OK_Click(object sender, RoutedEventArgs e)
+        {
+            DialogResult = true;
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialogViewModel.cs b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialogViewModel.cs
new file mode 100644
index 0000000000000000000000000000000000000000..120a39060bfaaeaeeb8b2b5e15faaba7463d75a0
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/MoveToNamespaceDialogViewModel.cs
@@ -0,0 +1,24 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using Microsoft.VisualStudio.Language.Intellisense;
+using Microsoft.VisualStudio.LanguageServices.Implementation.Utilities;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace
+{
+    class MoveToNamespaceDialogViewModel : AbstractNotifyPropertyChanged
+    {
+        public MoveToNamespaceDialogViewModel(
+            IGlyphService glyphService,
+            string defaultNamespace)
+        {
+            NamespaceName = defaultNamespace;
+        }
+
+        private string _namespaceName;
+        public string NamespaceName
+        {
+            get => _namespaceName;
+            set => SetProperty(ref _namespaceName, value);
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/VisualStudioMoveToNamespaceOptionsService.cs b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/VisualStudioMoveToNamespaceOptionsService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..57ab10571c9f1d2807e6e589ce8853453f085fab
--- /dev/null
+++ b/src/VisualStudio/Core/Def/Implementation/MoveToNamespace/VisualStudioMoveToNamespaceOptionsService.cs
@@ -0,0 +1,56 @@
+// Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
+
+using System;
+using System.Composition;
+using System.Threading;
+using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.Editor.Shared.Utilities;
+using Microsoft.CodeAnalysis.Host.Mef;
+using Microsoft.CodeAnalysis.LanguageServices;
+using Microsoft.CodeAnalysis.MoveToNamespace;
+using Microsoft.CodeAnalysis.Notification;
+using Microsoft.VisualStudio.Language.Intellisense;
+
+namespace Microsoft.VisualStudio.LanguageServices.Implementation.MoveToNamespace
+{
+    [Export(typeof(IMoveToNamespaceOptionsService)), Shared]
+    internal class VisualStudioMoveToNamespaceOptionsService : IMoveToNamespaceOptionsService
+    {
+        private readonly IGlyphService _glyphService;
+        private readonly IThreadingContext _threadingContext;
+
+        [ImportingConstructor]
+        [Obsolete(MefConstruction.ImportingConstructorMessage, error: true)]
+        public VisualStudioMoveToNamespaceOptionsService(IGlyphService glyphService, IThreadingContext threadingContext)
+        {
+            _glyphService = glyphService;
+            _threadingContext = threadingContext;
+        }
+
+        public async Task<MoveToNamespaceOptionsResult> GetChangeNamespaceOptionsAsync(
+            ISyntaxFactsService syntaxFactsService,
+            INotificationService notificationService,
+            string defaultNamespace,
+            CancellationToken cancellationToken)
+        {
+            await _threadingContext.JoinableTaskFactory.SwitchToMainThreadAsync(cancellationToken);
+            cancellationToken.ThrowIfCancellationRequested();
+
+            var viewModel = new MoveToNamespaceDialogViewModel(
+                _glyphService,
+                defaultNamespace);
+
+            var dialog = new MoveToNamespaceDialog(viewModel);
+            var result = dialog.ShowModal();
+
+            if (result == true)
+            {
+                return new MoveToNamespaceOptionsResult(viewModel.NamespaceName);
+            }
+            else
+            {
+                return MoveToNamespaceOptionsResult.Cancelled;
+            }
+        }
+    }
+}
diff --git a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
index 9e563a5224605d28d6e31e072d2a98dd7d5baba9..17965cbbce610b895a078f41f8667c817d91b65a 100644
--- a/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
+++ b/src/VisualStudio/Core/Def/Microsoft.VisualStudio.LanguageServices.csproj
@@ -50,6 +50,10 @@
       <Link>InternalUtilities\ShadowCopyAnalyzerAssemblyLoader.cs</Link>
     </Compile>
     <Compile Include="..\..\..\ExpressionEvaluator\Core\Source\ExpressionCompiler\DkmExceptionUtilities.cs" Link="Implementation\EditAndContinue\Interop\DkmExceptionUtilities.cs" />
+    <Compile Update="Implementation\MoveToNamespace\MoveToNamespaceDialog.xaml.cs">
+      <DependentUpon>MoveToNamespaceDialog.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
     <Compile Update="Implementation\PickMembers\PickMembersDialog.xaml.cs">
       <DependentUpon>PickMembersDialog.xaml</DependentUpon>
     </Compile>
@@ -218,6 +222,9 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Implementation\MoveToNamespace\MoveToNamespaceDialog.xaml">
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Implementation\PickMembers\PickMembersDialog.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
index 42c7a04d6f1a10613b442bb6e518ce03c47a1667..45d5c7d281842f14c6b3bfe4a936883d810e7633 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.Designer.cs
@@ -1604,6 +1604,15 @@ internal class ServicesVSResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Move To Namespace.
+        /// </summary>
+        internal static string Move_to_namespace {
+            get {
+                return ResourceManager.GetString("Move_to_namespace", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Move up.
         /// </summary>
@@ -1631,6 +1640,15 @@ internal class ServicesVSResources {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized string similar to Namespace:.
+        /// </summary>
+        internal static string Namespace_colon {
+            get {
+                return ResourceManager.GetString("Namespace:", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized string similar to Namespace: &apos;{0}&apos;.
         /// </summary>
diff --git a/src/VisualStudio/Core/Def/ServicesVSResources.resx b/src/VisualStudio/Core/Def/ServicesVSResources.resx
index 6ecf3ddea0f8b4d7c0da0e9698357e420c0258e9..14b5db27283489bc78f7f0cce6ea083dab0009a1 100644
--- a/src/VisualStudio/Core/Def/ServicesVSResources.resx
+++ b/src/VisualStudio/Core/Def/ServicesVSResources.resx
@@ -1201,4 +1201,10 @@ I agree to all of the foregoing:</value>
   <data name="Use_enhanced_colors_for_C_and_Basic" xml:space="preserve">
     <value>Use enhanced colors for C# and Basic</value>
   </data>
+  <data name="Move_to_namespace" xml:space="preserve">
+    <value>Move To Namespace</value>
+  </data>
+  <data name="Namespace" xml:space="preserve">
+    <value>Namespace</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
index 419999af1f6549ce4a12888c47080dd144b077d9..8660aa29a201f8660e79d89ea02ffb543b421872 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.cs.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Obor názvů: {0}</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
index ea9ec71172b8f3f0f2c533356bddad2a0f8e3646..87eb2a701a54f06ed1e3cc1ed1f8c5ccff2b8955 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.de.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Namespace: {0}</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
index 9892e759f92cc5bb154243bb10852e60754b20f8..b61f6bb09eab64d3d911c689bba896cf44be21ec 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.es.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Espacio de nombres: "{0}"</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
index 33f966f12067700823a79233a0af19d3bff90048..275ba3b6dd5ecbead30f6122f25dfa85ce1ed9ef 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.fr.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Espace de noms : '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
index 35e1d2f1d2443c18c99bdfe16f79ed7b896e6cf0..9a3f2fcc5f570e98805408733e3d3065b47498c6 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.it.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Spazio dei nomi: '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
index cb82175c7463376d24c7d1e2c0b8524525315f51..9d5f17bc6049b6da20bd15bf889a0d503a02d663 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ja.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">名前空間: '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
index 43ccca0c252af91aa950e55ff29fa3093437d691..3b27bbac8072e5c28701e25f9a8a85b9369073d2 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ko.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">네임스페이스: '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
index a41e247a627826a578c24757bad814ea8d2175a4..f59d3ef2ff9b4bca6d1351d5fc85ab8935b4d667 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pl.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Przestrzeń nazw: „{0}”</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
index 9bde0ad4195bdebf42e0ddeffa8d8b41f904ea8e..07575c13c73c23b0c62fa70a9b73c22e036a67fa 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.pt-BR.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Namespace: '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
index 964c7e5c18d968c00187a03701707b43d8ae0e4e..9a7a334d5cc81a9ae65d9f6f8325e945e9953aa7 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.ru.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Пространство имен: "{0}"</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
index 5d6092c93d629b995f59eb66b46d4ede358a180a..18d8693af15007ea7c6cfc63326889c4aa368f57 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.tr.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">Ad alanı: '{0}'</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
index a0e95c2c05f15d7b0a4b499d78c2b5d9ef7714d5..d1d3b9d4724fc9fe19cabc879b5f4bdf86675f2d 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hans.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">命名空间:“{0}”</target>
diff --git a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
index a86795bd4350ac061167529174efe09b8b0bed0a..ed0350b2005b3728f734dcea6a0c6d3fdfbfc774 100644
--- a/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
+++ b/src/VisualStudio/Core/Def/xlf/ServicesVSResources.zh-Hant.xlf
@@ -127,6 +127,16 @@
         <target state="new">Modifier preferences:</target>
         <note />
       </trans-unit>
+      <trans-unit id="Move_to_namespace">
+        <source>Move To Namespace</source>
+        <target state="new">Move To Namespace</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="Namespace">
+        <source>Namespace</source>
+        <target state="new">Namespace</target>
+        <note />
+      </trans-unit>
       <trans-unit id="Namespace_0">
         <source>Namespace: '{0}'</source>
         <target state="translated">命名空間: '{0}'</target>