diff --git a/clang/test/CMakeLists.txt b/clang/test/CMakeLists.txt
@@ -47,6 +47,7 @@ list(APPEND CLANG_TEST_DEPS
   clang-tblgen
   clang-offload-bundler
   clang-import-test
+  clang-rename
   )
 
 if(CLANG_ENABLE_STATIC_ANALYZER)

diff --git a/.../clang-rename/ClassAsTemplateArgument.cpp → .../clang-rename/ClassAsTemplateArgument.cpp b/.../clang-rename/ClassAsTemplateArgument.cpp → .../clang-rename/ClassAsTemplateArgument.cpp
diff --git a/...tra/test/clang-rename/ClassFindByName.cpp → clang/test/clang-rename/ClassFindByName.cpp b/...tra/test/clang-rename/ClassFindByName.cpp → clang/test/clang-rename/ClassFindByName.cpp
diff --git a/...a/test/clang-rename/ClassReplacements.cpp → ...g/test/clang-rename/ClassReplacements.cpp b/...a/test/clang-rename/ClassReplacements.cpp → ...g/test/clang-rename/ClassReplacements.cpp
diff --git a/...test/clang-rename/ClassSimpleRenaming.cpp → ...test/clang-rename/ClassSimpleRenaming.cpp b/...test/clang-rename/ClassSimpleRenaming.cpp → ...test/clang-rename/ClassSimpleRenaming.cpp
diff --git a/...xtra/test/clang-rename/ClassTestMulti.cpp → clang/test/clang-rename/ClassTestMulti.cpp b/...xtra/test/clang-rename/ClassTestMulti.cpp → clang/test/clang-rename/ClassTestMulti.cpp
diff --git a/...est/clang-rename/ClassTestMultiByName.cpp → ...est/clang-rename/ClassTestMultiByName.cpp b/...est/clang-rename/ClassTestMultiByName.cpp → ...est/clang-rename/ClassTestMultiByName.cpp
diff --git a/.../clang-rename/ComplexFunctionOverride.cpp → .../clang-rename/ComplexFunctionOverride.cpp b/.../clang-rename/ComplexFunctionOverride.cpp → .../clang-rename/ComplexFunctionOverride.cpp
diff --git a/...est/clang-rename/ComplicatedClassType.cpp → ...est/clang-rename/ComplicatedClassType.cpp b/...est/clang-rename/ComplicatedClassType.cpp → ...est/clang-rename/ComplicatedClassType.cpp
diff --git a/clang-tools-extra/test/clang-rename/Ctor.cpp → clang/test/clang-rename/Ctor.cpp b/clang-tools-extra/test/clang-rename/Ctor.cpp → clang/test/clang-rename/Ctor.cpp
diff --git a/...tra/test/clang-rename/CtorInitializer.cpp → clang/test/clang-rename/CtorInitializer.cpp b/...tra/test/clang-rename/CtorInitializer.cpp → clang/test/clang-rename/CtorInitializer.cpp
diff --git a/...s-extra/test/clang-rename/DeclRefExpr.cpp → clang/test/clang-rename/DeclRefExpr.cpp b/...s-extra/test/clang-rename/DeclRefExpr.cpp → clang/test/clang-rename/DeclRefExpr.cpp
diff --git a/...g-tools-extra/test/clang-rename/Field.cpp → clang/test/clang-rename/Field.cpp b/...g-tools-extra/test/clang-rename/Field.cpp → clang/test/clang-rename/Field.cpp
diff --git a/...extra/test/clang-rename/FunctionMacro.cpp → clang/test/clang-rename/FunctionMacro.cpp b/...extra/test/clang-rename/FunctionMacro.cpp → clang/test/clang-rename/FunctionMacro.cpp
diff --git a/...ra/test/clang-rename/FunctionOverride.cpp → clang/test/clang-rename/FunctionOverride.cpp b/...ra/test/clang-rename/FunctionOverride.cpp → clang/test/clang-rename/FunctionOverride.cpp
diff --git a/...ng-rename/FunctionWithClassFindByName.cpp → ...ng-rename/FunctionWithClassFindByName.cpp b/...ng-rename/FunctionWithClassFindByName.cpp → ...ng-rename/FunctionWithClassFindByName.cpp
diff --git a/.../clang-rename/IncludeHeaderWithSymbol.cpp → .../clang-rename/IncludeHeaderWithSymbol.cpp b/.../clang-rename/IncludeHeaderWithSymbol.cpp → .../clang-rename/IncludeHeaderWithSymbol.cpp
diff --git a/...st/clang-rename/Inputs/HeaderWithSymbol.h → ...st/clang-rename/Inputs/HeaderWithSymbol.h b/...st/clang-rename/Inputs/HeaderWithSymbol.h → ...st/clang-rename/Inputs/HeaderWithSymbol.h
diff --git a/.../clang-rename/Inputs/OffsetToNewName.yaml → .../clang-rename/Inputs/OffsetToNewName.yaml b/.../clang-rename/Inputs/OffsetToNewName.yaml → .../clang-rename/Inputs/OffsetToNewName.yaml
diff --git a/...rename/Inputs/QualifiedNameToNewName.yaml → ...rename/Inputs/QualifiedNameToNewName.yaml b/...rename/Inputs/QualifiedNameToNewName.yaml → ...rename/Inputs/QualifiedNameToNewName.yaml
diff --git a/...xtra/test/clang-rename/InvalidNewName.cpp → clang/test/clang-rename/InvalidNewName.cpp b/...xtra/test/clang-rename/InvalidNewName.cpp → clang/test/clang-rename/InvalidNewName.cpp
diff --git a/...extra/test/clang-rename/InvalidOffset.cpp → clang/test/clang-rename/InvalidOffset.cpp b/...extra/test/clang-rename/InvalidOffset.cpp → clang/test/clang-rename/InvalidOffset.cpp
diff --git a/...est/clang-rename/InvalidQualifiedName.cpp → ...est/clang-rename/InvalidQualifiedName.cpp b/...est/clang-rename/InvalidQualifiedName.cpp → ...est/clang-rename/InvalidQualifiedName.cpp
diff --git a/...tra/test/clang-rename/MemberExprMacro.cpp → clang/test/clang-rename/MemberExprMacro.cpp b/...tra/test/clang-rename/MemberExprMacro.cpp → clang/test/clang-rename/MemberExprMacro.cpp
diff --git a/...ols-extra/test/clang-rename/Namespace.cpp → clang/test/clang-rename/Namespace.cpp b/...ols-extra/test/clang-rename/Namespace.cpp → clang/test/clang-rename/Namespace.cpp
diff --git a/...ols-extra/test/clang-rename/NoNewName.cpp → clang/test/clang-rename/NoNewName.cpp b/...ols-extra/test/clang-rename/NoNewName.cpp → clang/test/clang-rename/NoNewName.cpp
diff --git a/...ang-rename/TemplateClassInstantiation.cpp → ...ang-rename/TemplateClassInstantiation.cpp b/...ang-rename/TemplateClassInstantiation.cpp → ...ang-rename/TemplateClassInstantiation.cpp
diff --git a/...ra/test/clang-rename/TemplateTypename.cpp → clang/test/clang-rename/TemplateTypename.cpp b/...ra/test/clang-rename/TemplateTypename.cpp → clang/test/clang-rename/TemplateTypename.cpp
diff --git a/...t/clang-rename/TemplatedClassFunction.cpp → ...t/clang-rename/TemplatedClassFunction.cpp b/...t/clang-rename/TemplatedClassFunction.cpp → ...t/clang-rename/TemplatedClassFunction.cpp
diff --git a/...st/clang-rename/UserDefinedConversion.cpp → ...st/clang-rename/UserDefinedConversion.cpp b/...st/clang-rename/UserDefinedConversion.cpp → ...st/clang-rename/UserDefinedConversion.cpp
diff --git a/...ools-extra/test/clang-rename/Variable.cpp → clang/test/clang-rename/Variable.cpp b/...ools-extra/test/clang-rename/Variable.cpp → clang/test/clang-rename/Variable.cpp
diff --git a/...extra/test/clang-rename/VariableMacro.cpp → clang/test/clang-rename/VariableMacro.cpp b/...extra/test/clang-rename/VariableMacro.cpp → clang/test/clang-rename/VariableMacro.cpp
diff --git a/...ols-extra/test/clang-rename/YAMLInput.cpp → clang/test/clang-rename/YAMLInput.cpp b/...ols-extra/test/clang-rename/YAMLInput.cpp → clang/test/clang-rename/YAMLInput.cpp
diff --git a/clang/tools/CMakeLists.txt b/clang/tools/CMakeLists.txt
@@ -10,6 +10,8 @@ add_clang_subdirectory(clang-offload-bundler)
 
 add_clang_subdirectory(c-index-test)
 
+add_clang_subdirectory(clang-rename)
+
 if(CLANG_ENABLE_ARCMT)
   add_clang_subdirectory(arcmt-test)
   add_clang_subdirectory(c-arcmt-test)

diff --git a/...ls-extra/clang-rename/tool/CMakeLists.txt → clang/tools/clang-rename/CMakeLists.txt b/...ls-extra/clang-rename/tool/CMakeLists.txt → clang/tools/clang-rename/CMakeLists.txt
@@ -3,10 +3,10 @@ add_clang_executable(clang-rename ClangRename.cpp)
 target_link_libraries(clang-rename
   clangBasic
   clangFrontend
-  clangRename
   clangRewrite
   clangTooling
   clangToolingCore
+  clangToolingRefactor
   )
 
 install(TARGETS clang-rename RUNTIME DESTINATION bin)

diff --git a/...s-extra/clang-rename/tool/ClangRename.cpp → clang/tools/clang-rename/ClangRename.cpp b/...s-extra/clang-rename/tool/ClangRename.cpp → clang/tools/clang-rename/ClangRename.cpp
@@ -13,8 +13,6 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "../RenamingAction.h"
-#include "../USRFindingAction.h"
 #include "clang/Basic/Diagnostic.h"
 #include "clang/Basic/DiagnosticOptions.h"
 #include "clang/Basic/FileManager.h"
@@ -26,6 +24,8 @@
 #include "clang/Rewrite/Core/Rewriter.h"
 #include "clang/Tooling/CommonOptionsParser.h"
 #include "clang/Tooling/Refactoring.h"
+#include "clang/Tooling/Refactoring/Rename/RenamingAction.h"
+#include "clang/Tooling/Refactoring/Rename/USRFindingAction.h"
 #include "clang/Tooling/ReplacementsYaml.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
@@ -160,7 +160,7 @@ int main(int argc, const char **argv) {
 
   auto Files = OP.getSourcePathList();
   tooling::RefactoringTool Tool(OP.getCompilations(), Files);
-  rename::USRFindingAction FindingAction(SymbolOffsets, QualifiedNames, Force);
+  tooling::USRFindingAction FindingAction(SymbolOffsets, QualifiedNames, Force);
   Tool.run(tooling::newFrontendActionFactory(&FindingAction).get());
   const std::vector<std::vector<std::string>> &USRList =
       FindingAction.getUSRList();
@@ -183,8 +183,8 @@ int main(int argc, const char **argv) {
   }
 
   // Perform the renaming.
-  rename::RenamingAction RenameAction(NewNames, PrevNames, USRList,
-                                      Tool.getReplacements(), PrintLocations);
+  tooling::RenamingAction RenameAction(NewNames, PrevNames, USRList,
+                                       Tool.getReplacements(), PrintLocations);
   std::unique_ptr<tooling::FrontendActionFactory> Factory =
       tooling::newFrontendActionFactory(&RenameAction);
   int ExitCode;

diff --git a/...s-extra/clang-rename/tool/clang-rename.el → clang/tools/clang-rename/clang-rename.el b/...s-extra/clang-rename/tool/clang-rename.el → clang/tools/clang-rename/clang-rename.el
diff --git a/...s-extra/clang-rename/tool/clang-rename.py → clang/tools/clang-rename/clang-rename.py b/...s-extra/clang-rename/tool/clang-rename.py → clang/tools/clang-rename/clang-rename.py
diff --git a/clang/unittests/CMakeLists.txt b/clang/unittests/CMakeLists.txt
@@ -29,3 +29,4 @@ add_subdirectory(CodeGen)
 if(NOT WIN32 AND CLANG_TOOL_LIBCLANG_BUILD) 
   add_subdirectory(libclang)
 endif()
+add_subdirectory(Rename)
diff --git a/...tra/unittests/clang-rename/CMakeLists.txt → clang/unittests/Rename/CMakeLists.txt b/...tra/unittests/clang-rename/CMakeLists.txt → clang/unittests/Rename/CMakeLists.txt
@@ -2,12 +2,6 @@ set(LLVM_LINK_COMPONENTS
   support
   )
 
-get_filename_component(CLANG_RENAME_SOURCE_DIR
-  ${CMAKE_CURRENT_SOURCE_DIR}/../../clang-rename REALPATH)
-include_directories(
-  ${CLANG_RENAME_SOURCE_DIR}
-  )
-
 # We'd like clang/unittests/Tooling/RewriterTestContext.h in the test.
 include_directories(${CLANG_SOURCE_DIR})
 
@@ -21,8 +15,8 @@ target_link_libraries(ClangRenameTests
   clangBasic
   clangFormat
   clangFrontend
-  clangRename
   clangRewrite
   clangTooling
   clangToolingCore
+  clangToolingRefactor
   )
diff --git a/.../unittests/clang-rename/ClangRenameTest.h → clang/unittests/Rename/ClangRenameTest.h b/.../unittests/clang-rename/ClangRenameTest.h → clang/unittests/Rename/ClangRenameTest.h
@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "RenamingAction.h"
-#include "USRFindingAction.h"
 #include "unittests/Tooling/RewriterTestContext.h"
 #include "clang/ASTMatchers/ASTMatchFinder.h"
 #include "clang/Basic/FileManager.h"
@@ -18,6 +16,8 @@
 #include "clang/Frontend/CompilerInstance.h"
 #include "clang/Frontend/PCHContainerOperations.h"
 #include "clang/Tooling/Refactoring.h"
+#include "clang/Tooling/Refactoring/Rename/RenamingAction.h"
+#include "clang/Tooling/Refactoring/Rename/USRFindingAction.h"
 #include "clang/Tooling/Tooling.h"
 #include "llvm/ADT/IntrusiveRefCntPtr.h"
 #include "llvm/ADT/StringRef.h"
@@ -56,7 +56,7 @@ class ClangRenameTest : public testing::Test,
     Context.createInMemoryFile(HeaderName, HeaderContent);
     clang::FileID InputFileID = Context.createInMemoryFile(CCName, NewCode);
 
-    rename::USRFindingAction FindingAction({}, {OldName}, false);
+    tooling::USRFindingAction FindingAction({}, {OldName}, false);
     std::unique_ptr<tooling::FrontendActionFactory> USRFindingActionFactory =
         tooling::newFrontendActionFactory(&FindingAction);
 
@@ -70,8 +70,8 @@ class ClangRenameTest : public testing::Test,
         FindingAction.getUSRList();
     std::vector<std::string> NewNames = {NewName};
     std::map<std::string, tooling::Replacements> FileToReplacements;
-    rename::QualifiedRenamingAction RenameAction(NewNames, USRList,
-                                                 FileToReplacements);
+    tooling::QualifiedRenamingAction RenameAction(NewNames, USRList,
+                                                  FileToReplacements);
     auto RenameActionFactory = tooling::newFrontendActionFactory(&RenameAction);
     if (!tooling::runToolOnCodeWithArgs(
             RenameActionFactory->create(), NewCode, {"-std=c++11"}, CCName,

diff --git a/...nittests/clang-rename/RenameClassTest.cpp → clang/unittests/Rename/RenameClassTest.cpp b/...nittests/clang-rename/RenameClassTest.cpp → clang/unittests/Rename/RenameClassTest.cpp