Additional orgnaization.

src/EditorFeatures/CSharpTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.cs

 // 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.AddConstructorParametersFromMembers;
 using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.AddConstructorParametersFromMembers;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
 using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
 using Roslyn.Test.Utilities;

src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.cs

@@ -2,15 +2,15 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateConstructorFromMembers;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
 using Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.CodeRefactorings;
+using Microsoft.CodeAnalysis.GenerateConstructorFromMembers;
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateConstructorFromMembers
 {
     public class GenerateConstructorFromMembersTests : AbstractCSharpCodeActionTest
     {

src/EditorFeatures/CSharpTest/GenerateFromMembers/GenerateEqualsAndGetHashCode/GenerateEqualsAndGetHashCodeTests.cs

@@ -2,7 +2,7 @@
 
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeRefactorings;
-using Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateEqualsAndGetHashCode;
+using Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers;
 using Microsoft.CodeAnalysis.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.CodeStyle;
 using Microsoft.CodeAnalysis.CSharp.Test.Utilities;
@@ -10,12 +10,12 @@
 using Roslyn.Test.Utilities;
 using Xunit;
 
-namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.Editor.CSharp.UnitTests.GenerateEqualsAndGetHashCodeFromMembers
 {
     public class GenerateEqualsAndGetHashCodeTests : AbstractCSharpCodeActionTest
     {
         protected override CodeRefactoringProvider CreateCodeRefactoringProvider(Workspace workspace)
-            => new GenerateEqualsAndGetHashCodeCodeRefactoringProvider();
+            => new GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider();
 
         [Fact, Trait(Traits.Feature, Traits.Features.CodeActionsGenerateEqualsAndGetHashCode)]
         public async Task TestEqualsSingleField()

src/EditorFeatures/TestUtilities/Traits.cs

@@ -50,7 +50,7 @@ public static class Features
             public const string CodeActionsGenerateEndConstruct = "CodeActions.GenerateEndConstruct";
             public const string CodeActionsGenerateEnumMember = "CodeActions.GenerateEnumMember";
             public const string CodeActionsGenerateEvent = "CodeActions.GenerateEvent";
-            public const string CodeActionsGenerateEqualsAndGetHashCode = "CodeActions.GenerateEqualsAndGetHashCode";
+            public const string CodeActionsGenerateEqualsAndGetHashCode = "CodeActions.GenerateEqualsAndGetHashCodeFromMembers";
             public const string CodeActionsGenerateVariable = "CodeActions.GenerateVariable";
             public const string CodeActionsGenerateMethod = "CodeActions.GenerateMethod";
             public const string CodeActionsGenerateType = "CodeActions.GenerateType";

src/EditorFeatures/VisualBasicTest/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.vb → src/EditorFeatures/VisualBasicTest/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
+Imports Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 Imports Microsoft.CodeAnalysis.CodeRefactorings
-Imports Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.AddConstructorParametersFromMembers
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.AddConstructorParametersFromMembers

src/EditorFeatures/VisualBasicTest/BasicEditorServicesTest.vbproj

@@ -187,9 +187,9 @@
     <Compile Include="CodeActions\EncapsulateField\EncapsulateFieldTests.vb" />
     <Compile Include="CodeActions\ExtractMethod\ExtractMethodTests.vb" />
     <Compile Include="CodeActions\GenerateDefaultConstructors\GenerateDefaultConstructorsTests.vb" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\AddConstructorParametersFromMembersTests.vb" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\GenerateConstructorFromMembersTests.vb" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\GenerateEqualsAndGetHashCodeTests.vb" />
+    <Compile Include="AddConstructorParametersFromMembers\AddConstructorParametersFromMembersTests.vb" />
+    <Compile Include="GenerateConstructorFromMembers\GenerateConstructorFromMembersTests.vb" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\GenerateEqualsAndGetHashCodeFromMembersTests.vb" />
     <Compile Include="CodeActions\InlineTemporary\InlineTemporaryTests.vb" />
     <Compile Include="CodeActions\IntroduceVariable\IntroduceVariableTests.vb" />
     <Compile Include="CodeActions\InvertIf\InvertIfTests.vb" />

src/EditorFeatures/VisualBasicTest/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.vb → src/EditorFeatures/VisualBasicTest/GenerateConstructorFromMembers/GenerateConstructorFromMembersTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports Microsoft.CodeAnalysis.CodeRefactorings
-Imports Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateConstructorFromMembers
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
+Imports Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.GenerateConstructorFromMembers
     Public Class GenerateConstructorFromMembersTests

src/EditorFeatures/VisualBasicTest/GenerateFromMembers/GenerateEqualsAndGetHashCode/GenerateEqualsAndGetHashCodeTests.vb → src/EditorFeatures/VisualBasicTest/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndGetHashCodeFromMembersTests.vb

 ' Copyright (c) Microsoft.  All Rights Reserved.  Licensed under the Apache License, Version 2.0.  See License.txt in the project root for license information.
 
 Imports Microsoft.CodeAnalysis.CodeRefactorings
-Imports Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateEqualsAndGetHashCode
 Imports Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.CodeRefactorings
+Imports Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 
 Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.UnitTests.GenerateConstructorFromMembers
-    Public Class GenerateEqualsAndGetHashCodeTests
+    Public Class GenerateEqualsAndGetHashCodeFromMembersTests
         Inherits AbstractVisualBasicCodeActionTest
 
         Protected Overrides Function CreateCodeRefactoringProvider(workspace As Workspace) As CodeRefactoringProvider
-            Return New GenerateEqualsAndGetHashCodeCodeRefactoringProvider()
+            Return New GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider()
         End Function
 
         <WorkItem(541991, "http://vstfdevdiv:8080/DevDiv2/DevDiv/_workitems/edit/541991")>

src/Features/CSharp/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/CSharpAddConstructorParametersFromMembersService.cs → src/Features/CSharp/Portable/AddConstructorParametersFromMembers/CSharpAddConstructorParametersFromMembersService.cs

@@ -5,12 +5,13 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers;
+using Microsoft.CodeAnalysis.AddConstructorParametersFromMembers;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
+using Microsoft.CodeAnalysis.CSharp.GenerateFromMembers;
 
-namespace Microsoft.CodeAnalysis.CSharp.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.CSharp.AddConstructorParametersFromMembers
 {
     [ExportLanguageService(typeof(IAddConstructorParametersFromMembersService), LanguageNames.CSharp), Shared]
     internal class CSharpAddConstructorParametersFromMembersService :

src/Features/CSharp/Portable/CSharpFeatures.csproj

@@ -334,9 +334,9 @@
     <Compile Include="ExtractMethod\CSharpSyntaxTriviaService.cs" />
     <Compile Include="ExtractMethod\CSharpSyntaxTriviaServiceFactory.cs" />
     <Compile Include="ExtractMethod\Extensions.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\CSharpAddConstructorParametersFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\CSharpGenerateConstructorFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\CSharpGenerateEqualsAndGetHashCodeService.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\CSharpAddConstructorParametersFromMembersService.cs" />
+    <Compile Include="GenerateConstructorFromMembers\CSharpGenerateConstructorFromMembersService.cs" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\CSharpGenerateEqualsAndGetHashCodeFromMembersService.cs" />
     <Compile Include="GenerateFromMembers\GenerateFromMembersHelpers.cs" />
     <Compile Include="GenerateMember\GenerateConstructor\CSharpGenerateConstructorService.cs" />
     <Compile Include="GenerateMember\GenerateDefaultConstructors\CSharpGenerateDefaultConstructorsService.cs" />

src/Features/CSharp/Portable/GenerateFromMembers/GenerateConstructorFromMembers/CSharpGenerateConstructorFromMembersService.cs → src/Features/CSharp/Portable/GenerateConstructorFromMembers/CSharpGenerateConstructorFromMembersService.cs

@@ -4,12 +4,13 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.GenerateFromMembers;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers;
+using Microsoft.CodeAnalysis.GenerateConstructorFromMembers;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.CSharp.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.CSharp.GenerateConstructorFromMembers
 {
     [ExportLanguageService(typeof(IGenerateConstructorFromMembersService), LanguageNames.CSharp), Shared]
     internal class CSharpGenerateConstructorFromMembersService :
@@ -27,4 +28,4 @@ internal class CSharpGenerateConstructorFromMembersService :
             return GenerateFromMembersHelpers.GetDeclaredSymbols(semanticModel, memberDeclaration, cancellationToken);
         }
     }
-}
+}
\ No newline at end of file

src/Features/CSharp/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/CSharpGenerateEqualsAndGetHashCodeService.cs → src/Features/CSharp/Portable/GenerateEqualsAndGetHashCodeFromMembers/CSharpGenerateEqualsAndGetHashCodeFromMembersService.cs

@@ -4,17 +4,18 @@
 using System.Composition;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.CodeAnalysis.CSharp.GenerateFromMembers;
 using Microsoft.CodeAnalysis.CSharp.Syntax;
-using Microsoft.CodeAnalysis.GenerateFromMembers.GenerateEqualsAndGetHashCode;
+using Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers;
 using Microsoft.CodeAnalysis.Host.Mef;
 using Microsoft.CodeAnalysis.Text;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.CSharp.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.CSharp.GenerateEqualsAndGetHashCodeFromMembers
 {
-    [ExportLanguageService(typeof(IGenerateEqualsAndGetHashCodeService), LanguageNames.CSharp), Shared]
-    internal class CSharpGenerateEqualsAndGetHashCodeService :
-        AbstractGenerateEqualsAndGetHashCodeService<CSharpGenerateEqualsAndGetHashCodeService, MemberDeclarationSyntax>
+    [ExportLanguageService(typeof(IGenerateEqualsAndGetHashCodeFromMembersService), LanguageNames.CSharp), Shared]
+    internal class CSharpGenerateEqualsAndGetHashCodeFromMembersService :
+        AbstractGenerateEqualsAndGetHashCodeFromMembersService<CSharpGenerateEqualsAndGetHashCodeFromMembersService, MemberDeclarationSyntax>
     {
         protected override async Task<IList<MemberDeclarationSyntax>> GetSelectedMembersAsync(
             Document document, TextSpan textSpan, CancellationToken cancellationToken)

src/Features/Core/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.CodeAction.cs → src/Features/Core/Portable/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.CodeAction.cs

@@ -12,7 +12,7 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Roslyn.Utilities;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 {
     internal abstract partial class AbstractAddConstructorParametersFromMembersService<TService, TMemberDeclarationSyntax>
     {

src/Features/Core/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.State.cs → src/Features/Core/Portable/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.State.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 {
     internal abstract partial class AbstractAddConstructorParametersFromMembersService<TService, TMemberDeclarationSyntax>
     {

src/Features/Core/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.cs → src/Features/Core/Portable/AddConstructorParametersFromMembers/AbstractAddConstructorParametersFromMembersService.cs

@@ -7,10 +7,11 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
 using Microsoft.CodeAnalysis.CodeGeneration;
+using Microsoft.CodeAnalysis.GenerateFromMembers;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 {
     internal abstract partial class AbstractAddConstructorParametersFromMembersService<TService, TMemberDeclarationSyntax> :
             AbstractGenerateFromMembersService<TMemberDeclarationSyntax>, IAddConstructorParametersFromMembersService

src/Features/Core/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersCodeRefactoringProvider.cs → src/Features/Core/Portable/AddConstructorParametersFromMembers/AddConstructorParametersFromMembersCodeRefactoringProvider.cs

@@ -2,10 +2,10 @@
 
 using System.Composition;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers;
+using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 {
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic,
         Name = PredefinedCodeRefactoringProviderNames.AddConstructorParametersFromMembers), Shared]

src/Features/Core/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/IAddConstructorParametersFromMembersService.cs → src/Features/Core/Portable/AddConstructorParametersFromMembers/IAddConstructorParametersFromMembersService.cs

@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers
+namespace Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
 {
     internal interface IAddConstructorParametersFromMembersService : ILanguageService
     {

src/Features/Core/Portable/CodeRefactorings/PredefinedCodeRefactoringProviderNames.cs

@@ -11,7 +11,7 @@ internal static class PredefinedCodeRefactoringProviderNames
         public const string ExtractMethod = "Extract Method Code Action Provider";
         public const string GenerateConstructorFromMembers = "Generate Constructor From Members Code Action Provider";
         public const string GenerateDefaultConstructors = "Generate Default Constructors Code Action Provider";
-        public const string GenerateEqualsAndGetHashCode = "Generate Equals and GetHashCode Code Action Provider";
+        public const string GenerateEqualsAndGetHashCodeFromMembers = "Generate Equals and GetHashCode Code Action Provider";
         public const string InlineTemporary = "Inline Temporary Code Action Provider";
         public const string IntroduceVariable = "Introduce Variable Code Action Provider";
         public const string InvertIf = "Invert If Code Action Provider";

src/Features/Core/Portable/Features.csproj

@@ -124,8 +124,8 @@
     </Compile>
     <Compile Include="CodeFixes\FixAllOccurrences\FixSomeCodeAction.cs" />
     <Compile Include="AddPackage\InstallPackageDirectlyCodeAction.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.State.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\IAddConstructorParametersFromMembersService.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.State.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\IAddConstructorParametersFromMembersService.cs" />
     <Compile Include="ImplementType\ImplementTypeOptions.cs" />
     <Compile Include="ImplementType\ImplementTypeOptionsProvider.cs" />
     <Compile Include="RemoveUnnecessaryImports\AbstractRemoveUnnecessaryImportsCodeFixProvider.cs" />
@@ -248,9 +248,9 @@
     <Compile Include="ConvertToInterpolatedString\AbstractConvertPlaceholderToInterpolatedStringRefactoringProvider.cs" />
     <Compile Include="CodeRefactorings\ExtractMethod\AbstractExtractMethodCodeRefactoringProvider.cs" />
     <Compile Include="CodeRefactorings\GenerateDefaultConstructors\GenerateDefaultConstructorsCodeRefactoringProvider.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\AddConstructorParametersFromMembersCodeRefactoringProvider.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\GenerateConstructorFromMembersCodeRefactoringProvider.cs" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\GenerateEqualsAndGetHashCodeCodeRefactoringProvider.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\AddConstructorParametersFromMembersCodeRefactoringProvider.cs" />
+    <Compile Include="GenerateConstructorFromMembers\GenerateConstructorFromMembersCodeRefactoringProvider.cs" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider.cs" />
     <Compile Include="CodeRefactorings\ICodeRefactoringHelpersService.cs" />
     <Compile Include="CodeRefactorings\ICodeRefactoringService.cs" />
     <Compile Include="CodeRefactorings\IntroduceVariable\IntroduceVariableCodeRefactoringProvider.cs" />
@@ -509,16 +509,16 @@
     <Compile Include="ExtractMethod\UniqueNameGenerator.cs" />
     <Compile Include="ExtractMethod\VariableStyle.cs" />
     <Compile Include="GenerateFromMembers\AbstractGenerateFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.CodeAction.cs" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.ConstructorDelegatingCodeAction.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.FieldDelegatingCodeAction.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.State.cs" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\IGenerateConstructorFromMembersService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\AbstractGenerateEqualsAndGetHashCodeService.cs" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\GenerateEqualsAndGetHashCodeCodeRefactoringProvider.CodeAction.cs" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\IGenerateEqualsAndGetHashCodeService.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.CodeAction.cs" />
+    <Compile Include="AddConstructorParametersFromMembers\AbstractAddConstructorParametersFromMembersService.cs" />
+    <Compile Include="GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.ConstructorDelegatingCodeAction.cs" />
+    <Compile Include="GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.cs" />
+    <Compile Include="GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.FieldDelegatingCodeAction.cs" />
+    <Compile Include="GenerateConstructorFromMembers\AbstractGenerateConstructorFromMembersService.State.cs" />
+    <Compile Include="GenerateConstructorFromMembers\IGenerateConstructorFromMembersService.cs" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\AbstractGenerateEqualsAndGetHashCodeFromMembersService.cs" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\AbstractGenerateEqualsAndGetHashCodeFromMembersService.CodeAction.cs" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\IGenerateEqualsAndGetHashCodeFromMembersService.cs" />
     <Compile Include="GenerateMember\AbstractGenerateMemberService.cs" />
     <Compile Include="GenerateMember\GenerateConstructor\AbstractGenerateConstructorService.CodeAction.cs" />
     <Compile Include="GenerateMember\GenerateConstructor\AbstractGenerateConstructorService.cs" />

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.ConstructorDelegatingCodeAction.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.ConstructorDelegatingCodeAction.cs

@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     internal abstract partial class AbstractGenerateConstructorFromMembersService<TService, TMemberDeclarationSyntax>
     {

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.FieldDelegatingCodeAction.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.FieldDelegatingCodeAction.cs

@@ -10,7 +10,7 @@
 using Microsoft.CodeAnalysis.LanguageServices;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     internal abstract partial class AbstractGenerateConstructorFromMembersService<TService, TMemberDeclarationSyntax>
     {

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.State.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.State.cs

@@ -6,7 +6,7 @@
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     internal abstract partial class AbstractGenerateConstructorFromMembersService<TService, TMemberDeclarationSyntax>
     {

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/AbstractGenerateConstructorFromMembersService.cs

@@ -5,10 +5,11 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.GenerateFromMembers;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     internal abstract partial class AbstractGenerateConstructorFromMembersService<TService, TMemberDeclarationSyntax> :
             AbstractGenerateFromMembersService<TMemberDeclarationSyntax>, IGenerateConstructorFromMembersService

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/GenerateConstructorFromMembersCodeRefactoringProvider.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/GenerateConstructorFromMembersCodeRefactoringProvider.cs

@@ -2,10 +2,10 @@
 
 using System.Composition;
 using System.Threading.Tasks;
-using Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers;
+using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     [ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic,
         Name = PredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers), Shared]

src/Features/Core/Portable/GenerateFromMembers/GenerateConstructorFromMembers/IGenerateConstructorFromMembersService.cs → src/Features/Core/Portable/GenerateConstructorFromMembers/IGenerateConstructorFromMembersService.cs

@@ -7,7 +7,7 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+namespace Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 {
     internal interface IGenerateConstructorFromMembersService : ILanguageService
     {

src/Features/Core/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/GenerateEqualsAndGetHashCodeCodeRefactoringProvider.CodeAction.cs → src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/AbstractGenerateEqualsAndGetHashCodeFromMembersService.CodeAction.cs

@@ -9,9 +9,9 @@
 using Microsoft.CodeAnalysis.Shared.Extensions;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 {
-    internal abstract partial class AbstractGenerateEqualsAndGetHashCodeService<TService, TMemberDeclarationSyntax>
+    internal abstract partial class AbstractGenerateEqualsAndGetHashCodeFromMembersService<TService, TMemberDeclarationSyntax>
     {
         private class GenerateEqualsAndHashCodeAction : CodeAction
         {

src/Features/Core/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/AbstractGenerateEqualsAndGetHashCodeService.cs → src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/AbstractGenerateEqualsAndGetHashCodeFromMembersService.cs

@@ -7,25 +7,26 @@
 using System.Threading.Tasks;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.CodeActions;
+using Microsoft.CodeAnalysis.GenerateFromMembers;
 using Microsoft.CodeAnalysis.Internal.Log;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 {
-    internal abstract partial class AbstractGenerateEqualsAndGetHashCodeService<TService, TMemberDeclarationSyntax> :
-        AbstractGenerateFromMembersService<TMemberDeclarationSyntax>, IGenerateEqualsAndGetHashCodeService
-        where TService : AbstractGenerateEqualsAndGetHashCodeService<TService, TMemberDeclarationSyntax>
+    internal abstract partial class AbstractGenerateEqualsAndGetHashCodeFromMembersService<TService, TMemberDeclarationSyntax> :
+        AbstractGenerateFromMembersService<TMemberDeclarationSyntax>, IGenerateEqualsAndGetHashCodeFromMembersService
+        where TService : AbstractGenerateEqualsAndGetHashCodeFromMembersService<TService, TMemberDeclarationSyntax>
         where TMemberDeclarationSyntax : SyntaxNode
     {
         private const string EqualsName = "Equals";
         private const string GetHashCodeName = "GetHashCode";
         private const string ObjName = nameof(ObjName);
 
-        protected AbstractGenerateEqualsAndGetHashCodeService()
+        protected AbstractGenerateEqualsAndGetHashCodeFromMembersService()
         {
         }
 
-        public async Task<ImmutableArray<CodeAction>> GenerateEqualsAndGetHashCodeAsync(
+        public async Task<ImmutableArray<CodeAction>> GenerateEqualsAndGetHashCodeFromMembersAsync(
             Document document,
             TextSpan textSpan,
             CancellationToken cancellationToken)

src/Features/Core/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/GenerateEqualsAndGetHashCodeCodeRefactoringProvider.cs → src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider.cs

 // 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.GenerateFromMembers.GenerateEqualsAndGetHashCode;
+using Microsoft.CodeAnalysis.CodeRefactorings;
 using Microsoft.CodeAnalysis.Shared.Extensions;
 
-namespace Microsoft.CodeAnalysis.CodeRefactorings.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 {
-    // [ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic, PredefinedCodeRefactoringProviderNames.GenerateEqualsAndGetHashCode)]
-    [ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers, Before = PredefinedCodeRefactoringProviderNames.AddConstructorParametersFromMembers)]
-    internal class GenerateEqualsAndGetHashCodeCodeRefactoringProvider : CodeRefactoringProvider
+    // [ExportCodeRefactoringProvider(LanguageNames.CSharp, LanguageNames.VisualBasic, PredefinedCodeRefactoringProviderNames.GenerateEqualsAndGetHashCodeFromMembers)]
+    [ExtensionOrder(After = PredefinedCodeRefactoringProviderNames.GenerateConstructorFromMembers,
+                    Before = PredefinedCodeRefactoringProviderNames.AddConstructorParametersFromMembers)]
+    internal class GenerateEqualsAndGetHashCodeFromMembersCodeRefactoringProvider : CodeRefactoringProvider
     {
         public override async Task ComputeRefactoringsAsync(CodeRefactoringContext context)
         {
@@ -21,8 +22,8 @@ public override async Task ComputeRefactoringsAsync(CodeRefactoringContext conte
                 return;
             }
 
-            var service = document.GetLanguageService<IGenerateEqualsAndGetHashCodeService>();
-            var actions = await service.GenerateEqualsAndGetHashCodeAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
+            var service = document.GetLanguageService<IGenerateEqualsAndGetHashCodeFromMembersService>();
+            var actions = await service.GenerateEqualsAndGetHashCodeFromMembersAsync(document, textSpan, cancellationToken).ConfigureAwait(false);
             if (!actions.IsDefault)
             {
                 context.RegisterRefactorings(actions);

src/Features/Core/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/IGenerateEqualsAndGetHashCodeService.cs → src/Features/Core/Portable/GenerateEqualsAndGetHashCodeFromMembers/IGenerateEqualsAndGetHashCodeFromMembersService.cs

@@ -7,10 +7,10 @@
 using Microsoft.CodeAnalysis.Host;
 using Microsoft.CodeAnalysis.Text;
 
-namespace Microsoft.CodeAnalysis.GenerateFromMembers.GenerateEqualsAndGetHashCode
+namespace Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 {
-    internal interface IGenerateEqualsAndGetHashCodeService : ILanguageService
+    internal interface IGenerateEqualsAndGetHashCodeFromMembersService : ILanguageService
     {
-        Task<ImmutableArray<CodeAction>> GenerateEqualsAndGetHashCodeAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
+        Task<ImmutableArray<CodeAction>> GenerateEqualsAndGetHashCodeFromMembersAsync(Document document, TextSpan textSpan, CancellationToken cancellationToken);
     }
 }
\ No newline at end of file

src/Features/VisualBasic/Portable/GenerateFromMembers/AddConstructorParametersFromMembers/VisualBasicAddConstructorParametersFromMembersService.vb → src/Features/VisualBasic/Portable/AddConstructorParametersFromMembers/VisualBasicAddConstructorParametersFromMembersService.vb

@@ -2,12 +2,13 @@
 
 Imports System.Composition
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.GenerateFromMembers.AddConstructorParametersFromMembers
+Imports Microsoft.CodeAnalysis.AddConstructorParametersFromMembers
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers.AddConstructorParametersFromMembers
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.AddConstructorParametersFromMembers
     <ExportLanguageService(GetType(IAddConstructorParametersFromMembersService), LanguageNames.VisualBasic), [Shared]>
     Friend Class VisualBasicAddConstructorParametersFromMembersService
         Inherits AbstractAddConstructorParametersFromMembersService(Of VisualBasicAddConstructorParametersFromMembersService, StatementSyntax)

src/Features/VisualBasic/Portable/BasicFeatures.vbproj

@@ -320,9 +320,9 @@
     <Compile Include="ExtractMethod\VisualBasicSyntaxTriviaServiceFactory.vb" />
     <Compile Include="Structure\Providers\ForBlockStructureProvider.vb" />
     <Compile Include="Structure\Providers\ForEachBlockStructureProvider.vb" />
-    <Compile Include="GenerateFromMembers\AddConstructorParametersFromMembers\VisualBasicAddConstructorParametersFromMembersService.vb" />
-    <Compile Include="GenerateFromMembers\GenerateConstructorFromMembers\VisualBasicGenerateConstructorFromMembersService.vb" />
-    <Compile Include="GenerateFromMembers\GenerateEqualsAndGetHashCode\VisualBasicGenerateEqualsAndGetHashCodeService.vb" />
+    <Compile Include="AddConstructorParametersFromMembers\VisualBasicAddConstructorParametersFromMembersService.vb" />
+    <Compile Include="GenerateConstructorFromMembers\VisualBasicGenerateConstructorFromMembersService.vb" />
+    <Compile Include="GenerateEqualsAndGetHashCodeFromMembers\VisualBasicGenerateEqualsAndGetHashCodeService.vb" />
     <Compile Include="GenerateFromMembers\GenerateFromMembersHelpers.vb" />
     <Compile Include="GenerateMember\GenerateConstructor\VisualBasicGenerateConstructorService.vb" />
     <Compile Include="GenerateMember\GenerateDefaultConstructors\VisualBasicGenerateDefaultConstructorsService.vb" />

src/Features/VisualBasic/Portable/GenerateFromMembers/GenerateConstructorFromMembers/VisualBasicGenerateConstructorFromMembersService.vb → src/Features/VisualBasic/Portable/GenerateConstructorFromMembers/VisualBasicGenerateConstructorFromMembersService.vb

@@ -2,12 +2,13 @@
 
 Imports System.Composition
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.GenerateFromMembers.GenerateConstructorFromMembers
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers
+Imports Microsoft.CodeAnalysis.GenerateConstructorFromMembers
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers.GenerateConstructorFromMembers
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateConstructorFromMembers
     <ExportLanguageService(GetType(IGenerateConstructorFromMembersService), LanguageNames.VisualBasic), [Shared]>
     Friend Class VisualBasicGenerateConstructorFromMembersService
         Inherits AbstractGenerateConstructorFromMembersService(Of VisualBasicGenerateConstructorFromMembersService, StatementSyntax)

src/Features/VisualBasic/Portable/GenerateFromMembers/GenerateEqualsAndGetHashCode/VisualBasicGenerateEqualsAndGetHashCodeService.vb → src/Features/VisualBasic/Portable/GenerateEqualsAndGetHashCodeFromMembers/VisualBasicGenerateEqualsAndGetHashCodeService.vb

@@ -2,15 +2,16 @@
 
 Imports System.Composition
 Imports System.Threading
-Imports Microsoft.CodeAnalysis.GenerateFromMembers.GenerateEqualsAndGetHashCode
+Imports Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers
+Imports Microsoft.CodeAnalysis.GenerateEqualsAndGetHashCodeFromMembers
 Imports Microsoft.CodeAnalysis.Host.Mef
 Imports Microsoft.CodeAnalysis.Text
 Imports Microsoft.CodeAnalysis.VisualBasic.Syntax
 
-Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateFromMembers.GenerateEqualsAndGetHashCode
-    <ExportLanguageService(GetType(IGenerateEqualsAndGetHashCodeService), LanguageNames.VisualBasic), [Shared]>
-    Friend Class VisualBasicGenerateEqualsAndGetHashCodeService
-        Inherits AbstractGenerateEqualsAndGetHashCodeService(Of VisualBasicGenerateEqualsAndGetHashCodeService, StatementSyntax)
+Namespace Microsoft.CodeAnalysis.Editor.VisualBasic.GenerateEqualsAndGetHashCodeFromMembers
+    <ExportLanguageService(GetType(IGenerateEqualsAndGetHashCodeFromMembersService), LanguageNames.VisualBasic), [Shared]>
+    Friend Class VisualBasicGenerateEqualsAndGetHashCodeFromMembersService
+        Inherits AbstractGenerateEqualsAndGetHashCodeFromMembersService(Of VisualBasicGenerateEqualsAndGetHashCodeFromMembersService, StatementSyntax)
 
         Protected Overloads Overrides Async Function GetSelectedMembersAsync(
                 document As Document, textSpan As TextSpan, cancellationToken As CancellationToken) As Task(Of IList(Of StatementSyntax))