diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp b/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
similarity index 99%
rename from llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
rename to llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
index 56f72bbc1474..4cd96698c2f0 100644
--- a/llvm/lib/Target/MSP430/AsmPrinter/MSP430AsmPrinter.cpp
+++ b/llvm/lib/Target/MSP430/MSP430AsmPrinter.cpp
@@ -15,7 +15,7 @@
 #define DEBUG_TYPE "asm-printer"
 #include "MSP430.h"
 #include "MSP430InstrInfo.h"
-#include "MSP430InstPrinter.h"
+#include "AsmPrinter/MSP430InstPrinter.h"
 #include "MSP430MCAsmInfo.h"
 #include "MSP430MCInstLower.h"
 #include "MSP430TargetMachine.h"
diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.cpp b/llvm/lib/Target/MSP430/MSP430MCInstLower.cpp
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.cpp
rename to llvm/lib/Target/MSP430/MSP430MCInstLower.cpp
diff --git a/llvm/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.h b/llvm/lib/Target/MSP430/MSP430MCInstLower.h
similarity index 100%
rename from llvm/lib/Target/MSP430/AsmPrinter/MSP430MCInstLower.h
rename to llvm/lib/Target/MSP430/MSP430MCInstLower.h