diff --git a/tools/llvm-mca/CMakeLists.txt b/tools/llvm-mca/CMakeLists.txt
index bb657b8d19f..a1bc11740d1 100644
--- a/tools/llvm-mca/CMakeLists.txt
+++ b/tools/llvm-mca/CMakeLists.txt
@@ -10,33 +10,33 @@ set(LLVM_LINK_COMPONENTS
   )
 
 add_llvm_tool(llvm-mca
+  llvm-mca.cpp
   CodeRegion.cpp
   Context.cpp
   DispatchStage.cpp
-  DispatchStatistics.cpp
   ExecuteStage.cpp
   FetchStage.cpp
   HWEventListener.cpp
   HardwareUnit.cpp
   InstrBuilder.cpp
   Instruction.cpp
-  InstructionInfoView.cpp
   InstructionTables.cpp
   LSUnit.cpp
-  llvm-mca.cpp
   Pipeline.cpp
   PipelinePrinter.cpp
   RegisterFile.cpp
-  RegisterFileStatistics.cpp
-  ResourcePressureView.cpp
   RetireControlUnit.cpp
-  RetireControlUnitStatistics.cpp
   RetireStage.cpp
   Scheduler.cpp
-  SchedulerStatistics.cpp
   Stage.cpp
   Support.cpp
-  SummaryView.cpp
-  TimelineView.cpp
-  View.cpp
+  Views/DispatchStatistics.cpp
+  Views/InstructionInfoView.cpp
+  Views/RegisterFileStatistics.cpp
+  Views/ResourcePressureView.cpp
+  Views/RetireControlUnitStatistics.cpp
+  Views/SchedulerStatistics.cpp
+  Views/SummaryView.cpp
+  Views/TimelineView.cpp
+  Views/View.cpp
   )
diff --git a/tools/llvm-mca/InstructionTables.h b/tools/llvm-mca/InstructionTables.h
index 4acc672c6f9..346f8727790 100644
--- a/tools/llvm-mca/InstructionTables.h
+++ b/tools/llvm-mca/InstructionTables.h
@@ -20,7 +20,6 @@
 #include "InstrBuilder.h"
 #include "Scheduler.h"
 #include "Stage.h"
-#include "View.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/MC/MCSchedule.h"
 
diff --git a/tools/llvm-mca/PipelinePrinter.cpp b/tools/llvm-mca/PipelinePrinter.cpp
index c5b1a12b792..619f22cc810 100644
--- a/tools/llvm-mca/PipelinePrinter.cpp
+++ b/tools/llvm-mca/PipelinePrinter.cpp
@@ -13,7 +13,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "PipelinePrinter.h"
-#include "View.h"
+#include "Views/View.h"
 
 namespace mca {
 
diff --git a/tools/llvm-mca/PipelinePrinter.h b/tools/llvm-mca/PipelinePrinter.h
index fe871414418..a90b3a2af42 100644
--- a/tools/llvm-mca/PipelinePrinter.h
+++ b/tools/llvm-mca/PipelinePrinter.h
@@ -18,7 +18,7 @@
 #define LLVM_TOOLS_LLVM_MCA_PIPELINEPRINTER_H
 
 #include "Pipeline.h"
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/tools/llvm-mca/DispatchStatistics.cpp b/tools/llvm-mca/Views/DispatchStatistics.cpp
similarity index 98%
rename from tools/llvm-mca/DispatchStatistics.cpp
rename to tools/llvm-mca/Views/DispatchStatistics.cpp
index 4bddbef9a0c..15cdbd34948 100644
--- a/tools/llvm-mca/DispatchStatistics.cpp
+++ b/tools/llvm-mca/Views/DispatchStatistics.cpp
@@ -13,7 +13,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "DispatchStatistics.h"
+#include "Views/DispatchStatistics.h"
 #include "llvm/Support/Format.h"
 
 using namespace llvm;
diff --git a/tools/llvm-mca/DispatchStatistics.h b/tools/llvm-mca/Views/DispatchStatistics.h
similarity index 99%
rename from tools/llvm-mca/DispatchStatistics.h
rename to tools/llvm-mca/Views/DispatchStatistics.h
index 1e389d54766..9c64c722148 100644
--- a/tools/llvm-mca/DispatchStatistics.h
+++ b/tools/llvm-mca/Views/DispatchStatistics.h
@@ -34,7 +34,7 @@
 #ifndef LLVM_TOOLS_LLVM_MCA_DISPATCHVIEW_H
 #define LLVM_TOOLS_LLVM_MCA_DISPATCHVIEW_H
 
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include <map>
diff --git a/tools/llvm-mca/InstructionInfoView.cpp b/tools/llvm-mca/Views/InstructionInfoView.cpp
similarity index 98%
rename from tools/llvm-mca/InstructionInfoView.cpp
rename to tools/llvm-mca/Views/InstructionInfoView.cpp
index 0e50a96d19c..a2e3001383a 100644
--- a/tools/llvm-mca/InstructionInfoView.cpp
+++ b/tools/llvm-mca/Views/InstructionInfoView.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "InstructionInfoView.h"
+#include "Views/InstructionInfoView.h"
 
 namespace mca {
 
diff --git a/tools/llvm-mca/InstructionInfoView.h b/tools/llvm-mca/Views/InstructionInfoView.h
similarity index 98%
rename from tools/llvm-mca/InstructionInfoView.h
rename to tools/llvm-mca/Views/InstructionInfoView.h
index 0770ae3d2b5..435c058d824 100644
--- a/tools/llvm-mca/InstructionInfoView.h
+++ b/tools/llvm-mca/Views/InstructionInfoView.h
@@ -36,7 +36,7 @@
 #define LLVM_TOOLS_LLVM_MCA_INSTRUCTIONINFOVIEW_H
 
 #include "SourceMgr.h"
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCInstrInfo.h"
 #include "llvm/MC/MCSubtargetInfo.h"
diff --git a/tools/llvm-mca/RegisterFileStatistics.cpp b/tools/llvm-mca/Views/RegisterFileStatistics.cpp
similarity index 98%
rename from tools/llvm-mca/RegisterFileStatistics.cpp
rename to tools/llvm-mca/Views/RegisterFileStatistics.cpp
index 1b07bf9a3b3..7dbc76a51e1 100644
--- a/tools/llvm-mca/RegisterFileStatistics.cpp
+++ b/tools/llvm-mca/Views/RegisterFileStatistics.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "RegisterFileStatistics.h"
+#include "Views/RegisterFileStatistics.h"
 #include "llvm/Support/Format.h"
 
 using namespace llvm;
diff --git a/tools/llvm-mca/RegisterFileStatistics.h b/tools/llvm-mca/Views/RegisterFileStatistics.h
similarity index 98%
rename from tools/llvm-mca/RegisterFileStatistics.h
rename to tools/llvm-mca/Views/RegisterFileStatistics.h
index cbe816cd333..3dcac4d4f75 100644
--- a/tools/llvm-mca/RegisterFileStatistics.h
+++ b/tools/llvm-mca/Views/RegisterFileStatistics.h
@@ -32,7 +32,7 @@
 #ifndef LLVM_TOOLS_LLVM_MCA_REGISTERFILESTATISTICS_H
 #define LLVM_TOOLS_LLVM_MCA_REGISTERFILESTATISTICS_H
 
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 
diff --git a/tools/llvm-mca/ResourcePressureView.cpp b/tools/llvm-mca/Views/ResourcePressureView.cpp
similarity index 99%
rename from tools/llvm-mca/ResourcePressureView.cpp
rename to tools/llvm-mca/Views/ResourcePressureView.cpp
index fe9d5b7fabc..75f5261b954 100644
--- a/tools/llvm-mca/ResourcePressureView.cpp
+++ b/tools/llvm-mca/Views/ResourcePressureView.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "ResourcePressureView.h"
+#include "Views/ResourcePressureView.h"
 #include "llvm/Support/FormattedStream.h"
 #include "llvm/Support/raw_ostream.h"
 
diff --git a/tools/llvm-mca/ResourcePressureView.h b/tools/llvm-mca/Views/ResourcePressureView.h
similarity index 99%
rename from tools/llvm-mca/ResourcePressureView.h
rename to tools/llvm-mca/Views/ResourcePressureView.h
index fe1c6af5e6f..b92ed0d8b0b 100644
--- a/tools/llvm-mca/ResourcePressureView.h
+++ b/tools/llvm-mca/Views/ResourcePressureView.h
@@ -59,7 +59,7 @@
 #define LLVM_TOOLS_LLVM_MCA_RESOURCEPRESSUREVIEW_H
 
 #include "SourceMgr.h"
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCSubtargetInfo.h"
diff --git a/tools/llvm-mca/RetireControlUnitStatistics.cpp b/tools/llvm-mca/Views/RetireControlUnitStatistics.cpp
similarity index 96%
rename from tools/llvm-mca/RetireControlUnitStatistics.cpp
rename to tools/llvm-mca/Views/RetireControlUnitStatistics.cpp
index edb855e11e8..d5aab396b4c 100644
--- a/tools/llvm-mca/RetireControlUnitStatistics.cpp
+++ b/tools/llvm-mca/Views/RetireControlUnitStatistics.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "RetireControlUnitStatistics.h"
+#include "Views/RetireControlUnitStatistics.h"
 #include "llvm/Support/Format.h"
 
 using namespace llvm;
diff --git a/tools/llvm-mca/RetireControlUnitStatistics.h b/tools/llvm-mca/Views/RetireControlUnitStatistics.h
similarity index 98%
rename from tools/llvm-mca/RetireControlUnitStatistics.h
rename to tools/llvm-mca/Views/RetireControlUnitStatistics.h
index 1f03e7efe88..0531e389c90 100644
--- a/tools/llvm-mca/RetireControlUnitStatistics.h
+++ b/tools/llvm-mca/Views/RetireControlUnitStatistics.h
@@ -26,7 +26,7 @@
 #ifndef LLVM_TOOLS_LLVM_MCA_RETIRECONTROLUNITSTATISTICS_H
 #define LLVM_TOOLS_LLVM_MCA_RETIRECONTROLUNITSTATISTICS_H
 
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include <map>
 
diff --git a/tools/llvm-mca/SchedulerStatistics.cpp b/tools/llvm-mca/Views/SchedulerStatistics.cpp
similarity index 98%
rename from tools/llvm-mca/SchedulerStatistics.cpp
rename to tools/llvm-mca/Views/SchedulerStatistics.cpp
index 5c6d22a7181..f5e4c891c42 100644
--- a/tools/llvm-mca/SchedulerStatistics.cpp
+++ b/tools/llvm-mca/Views/SchedulerStatistics.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "SchedulerStatistics.h"
+#include "Views/SchedulerStatistics.h"
 #include "llvm/Support/Format.h"
 
 using namespace llvm;
diff --git a/tools/llvm-mca/SchedulerStatistics.h b/tools/llvm-mca/Views/SchedulerStatistics.h
similarity index 99%
rename from tools/llvm-mca/SchedulerStatistics.h
rename to tools/llvm-mca/Views/SchedulerStatistics.h
index 7383c54a161..3857c0e55a8 100644
--- a/tools/llvm-mca/SchedulerStatistics.h
+++ b/tools/llvm-mca/Views/SchedulerStatistics.h
@@ -31,7 +31,7 @@
 #ifndef LLVM_TOOLS_LLVM_MCA_SCHEDULERSTATISTICS_H
 #define LLVM_TOOLS_LLVM_MCA_SCHEDULERSTATISTICS_H
 
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include <map>
diff --git a/tools/llvm-mca/SummaryView.cpp b/tools/llvm-mca/Views/SummaryView.cpp
similarity index 99%
rename from tools/llvm-mca/SummaryView.cpp
rename to tools/llvm-mca/Views/SummaryView.cpp
index 01399055c4f..4a147bb6bca 100644
--- a/tools/llvm-mca/SummaryView.cpp
+++ b/tools/llvm-mca/Views/SummaryView.cpp
@@ -13,7 +13,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "SummaryView.h"
+#include "Views/SummaryView.h"
 #include "Support.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/Support/Format.h"
diff --git a/tools/llvm-mca/SummaryView.h b/tools/llvm-mca/Views/SummaryView.h
similarity index 99%
rename from tools/llvm-mca/SummaryView.h
rename to tools/llvm-mca/Views/SummaryView.h
index b799ce3aa74..13875976d39 100644
--- a/tools/llvm-mca/SummaryView.h
+++ b/tools/llvm-mca/Views/SummaryView.h
@@ -30,7 +30,7 @@
 #define LLVM_TOOLS_LLVM_MCA_SUMMARYVIEW_H
 
 #include "SourceMgr.h"
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/ADT/DenseMap.h"
 #include "llvm/MC/MCSchedule.h"
 #include "llvm/Support/raw_ostream.h"
diff --git a/tools/llvm-mca/TimelineView.cpp b/tools/llvm-mca/Views/TimelineView.cpp
similarity index 99%
rename from tools/llvm-mca/TimelineView.cpp
rename to tools/llvm-mca/Views/TimelineView.cpp
index 6e75cac0d43..79dfa3a9d80 100644
--- a/tools/llvm-mca/TimelineView.cpp
+++ b/tools/llvm-mca/Views/TimelineView.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "TimelineView.h"
+#include "Views/TimelineView.h"
 
 using namespace llvm;
 
diff --git a/tools/llvm-mca/TimelineView.h b/tools/llvm-mca/Views/TimelineView.h
similarity index 99%
rename from tools/llvm-mca/TimelineView.h
rename to tools/llvm-mca/Views/TimelineView.h
index e53c23ec1cc..98369a9fbec 100644
--- a/tools/llvm-mca/TimelineView.h
+++ b/tools/llvm-mca/Views/TimelineView.h
@@ -101,7 +101,7 @@
 #define LLVM_TOOLS_LLVM_MCA_TIMELINEVIEW_H
 
 #include "SourceMgr.h"
-#include "View.h"
+#include "Views/View.h"
 #include "llvm/MC/MCInstPrinter.h"
 #include "llvm/MC/MCSubtargetInfo.h"
 #include "llvm/Support/FormattedStream.h"
diff --git a/tools/llvm-mca/View.cpp b/tools/llvm-mca/Views/View.cpp
similarity index 96%
rename from tools/llvm-mca/View.cpp
rename to tools/llvm-mca/Views/View.cpp
index 390a7aeb3b9..1cf4daeec84 100644
--- a/tools/llvm-mca/View.cpp
+++ b/tools/llvm-mca/Views/View.cpp
@@ -12,7 +12,7 @@
 ///
 //===----------------------------------------------------------------------===//
 
-#include "View.h"
+#include "Views/View.h"
 
 namespace mca {
 
diff --git a/tools/llvm-mca/View.h b/tools/llvm-mca/Views/View.h
similarity index 100%
rename from tools/llvm-mca/View.h
rename to tools/llvm-mca/Views/View.h
diff --git a/tools/llvm-mca/llvm-mca.cpp b/tools/llvm-mca/llvm-mca.cpp
index 15f9a862ecf..6ef936708df 100644
--- a/tools/llvm-mca/llvm-mca.cpp
+++ b/tools/llvm-mca/llvm-mca.cpp
@@ -23,18 +23,18 @@
 
 #include "CodeRegion.h"
 #include "Context.h"
-#include "DispatchStatistics.h"
 #include "FetchStage.h"
-#include "InstructionInfoView.h"
 #include "InstructionTables.h"
 #include "Pipeline.h"
 #include "PipelinePrinter.h"
-#include "RegisterFileStatistics.h"
-#include "ResourcePressureView.h"
-#include "RetireControlUnitStatistics.h"
-#include "SchedulerStatistics.h"
-#include "SummaryView.h"
-#include "TimelineView.h"
+#include "Views/DispatchStatistics.h"
+#include "Views/InstructionInfoView.h"
+#include "Views/RegisterFileStatistics.h"
+#include "Views/ResourcePressureView.h"
+#include "Views/RetireControlUnitStatistics.h"
+#include "Views/SchedulerStatistics.h"
+#include "Views/SummaryView.h"
+#include "Views/TimelineView.h"
 #include "llvm/MC/MCAsmInfo.h"
 #include "llvm/MC/MCContext.h"
 #include "llvm/MC/MCObjectFileInfo.h"