diff --git a/llvm/tools/llvm-diff/CMakeLists.txt b/llvm/tools/llvm-diff/CMakeLists.txt
index 703ed97cb0b01d..d2abab9719d9a8 100644
--- a/llvm/tools/llvm-diff/CMakeLists.txt
+++ b/llvm/tools/llvm-diff/CMakeLists.txt
@@ -6,10 +6,10 @@ set(LLVM_LINK_COMPONENTS
 
 add_llvm_tool(llvm-diff
   llvm-diff.cpp
-  DiffConsumer.cpp
-  DiffLog.cpp
-  DifferenceEngine.cpp
 
   DEPENDS
   intrinsics_gen
   )
+
+add_subdirectory(lib)
+target_link_libraries(llvm-diff PRIVATE LLVMDiff)
diff --git a/llvm/tools/llvm-diff/lib/CMakeLists.txt b/llvm/tools/llvm-diff/lib/CMakeLists.txt
new file mode 100644
index 00000000000000..270c3d79480a72
--- /dev/null
+++ b/llvm/tools/llvm-diff/lib/CMakeLists.txt
@@ -0,0 +1,14 @@
+set(LLVM_LINK_COMPONENTS
+    Core
+    Support
+    )
+
+add_llvm_library(LLVMDiff
+  STATIC
+  DiffConsumer.cpp
+  DiffConsumer.h
+  DifferenceEngine.cpp
+  DifferenceEngine.h
+  DiffLog.cpp
+  DiffLog.h
+  )
diff --git a/llvm/tools/llvm-diff/DiffConsumer.cpp b/llvm/tools/llvm-diff/lib/DiffConsumer.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/DiffConsumer.cpp
rename to llvm/tools/llvm-diff/lib/DiffConsumer.cpp
diff --git a/llvm/tools/llvm-diff/DiffConsumer.h b/llvm/tools/llvm-diff/lib/DiffConsumer.h
similarity index 100%
rename from llvm/tools/llvm-diff/DiffConsumer.h
rename to llvm/tools/llvm-diff/lib/DiffConsumer.h
diff --git a/llvm/tools/llvm-diff/DiffLog.cpp b/llvm/tools/llvm-diff/lib/DiffLog.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/DiffLog.cpp
rename to llvm/tools/llvm-diff/lib/DiffLog.cpp
diff --git a/llvm/tools/llvm-diff/DiffLog.h b/llvm/tools/llvm-diff/lib/DiffLog.h
similarity index 100%
rename from llvm/tools/llvm-diff/DiffLog.h
rename to llvm/tools/llvm-diff/lib/DiffLog.h
diff --git a/llvm/tools/llvm-diff/DifferenceEngine.cpp b/llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
similarity index 100%
rename from llvm/tools/llvm-diff/DifferenceEngine.cpp
rename to llvm/tools/llvm-diff/lib/DifferenceEngine.cpp
diff --git a/llvm/tools/llvm-diff/DifferenceEngine.h b/llvm/tools/llvm-diff/lib/DifferenceEngine.h
similarity index 100%
rename from llvm/tools/llvm-diff/DifferenceEngine.h
rename to llvm/tools/llvm-diff/lib/DifferenceEngine.h
diff --git a/llvm/tools/llvm-diff/llvm-diff.cpp b/llvm/tools/llvm-diff/llvm-diff.cpp
index 8a11179e741ec5..d9d19f35ffee84 100644
--- a/llvm/tools/llvm-diff/llvm-diff.cpp
+++ b/llvm/tools/llvm-diff/llvm-diff.cpp
@@ -10,8 +10,8 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "DiffLog.h"
-#include "DifferenceEngine.h"
+#include "lib/DiffLog.h"
+#include "lib/DifferenceEngine.h"
 #include "llvm/ADT/StringRef.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/Module.h"