diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/FixAll/FixAllGetFixesService.cs b/src/EditorFeatures/Core.Wpf/Suggestions/FixAll/FixAllGetFixesService.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/FixAll/FixAllGetFixesService.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/FixAll/FixAllGetFixesService.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/FixAll/FixMultipleOccurrencesService.cs b/src/EditorFeatures/Core.Wpf/Suggestions/FixAll/FixMultipleOccurrencesService.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/FixAll/FixMultipleOccurrencesService.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/FixAll/FixMultipleOccurrencesService.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/ISuggestedActionCallback.cs b/src/EditorFeatures/Core.Wpf/Suggestions/ISuggestedActionCallback.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/ISuggestedActionCallback.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/ISuggestedActionCallback.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesCodeAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/PreviewChanges/PreviewChangesCodeAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesCodeAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/PreviewChanges/PreviewChangesCodeAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/PreviewChanges/PreviewChangesSuggestedAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionSetComparer.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionSetComparer.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionSetComparer.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionSetComparer.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithNestedActions.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithNestedActions.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedActions.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithNestedFlavors.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedFlavors.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionWithNestedFlavors.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionWithNestedFlavors.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/CodeFixSuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/CodeFixSuggestedAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/CodeFixSuggestedAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/CodeFixSuggestedAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/CodeRefactoringSuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/CodeRefactoringSuggestedAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/CodeRefactoringSuggestedAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/CodeRefactoringSuggestedAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/FixAllSuggestedAction.FixAllCodeAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/FixAllSuggestedAction.FixAllCodeAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/FixAllSuggestedAction.FixAllCodeAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/FixAllSuggestedAction.FixAllCodeAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/FixAllSuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/FixAllSuggestedAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/FixAllSuggestedAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/FixAllSuggestedAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/SuggestedAction.CaretPositionRestorer.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.CaretPositionRestorer.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/SuggestedAction.CaretPositionRestorer.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.CaretPositionRestorer.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/SuggestedAction.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActions/SuggestedAction.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActions/SuggestedAction.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSource.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSource.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSource.cs
diff --git a/src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs b/src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs
similarity index 100%
rename from src/EditorFeatures/Core/Implementation/Suggestions/SuggestedActionsSourceProvider.cs
rename to src/EditorFeatures/Core.Wpf/Suggestions/SuggestedActionsSourceProvider.cs