diff --git a/lib/MC/CMakeLists.txt b/lib/MC/CMakeLists.txt
index 8a1a058..9ead33b 100644
--- a/lib/MC/CMakeLists.txt
+++ b/lib/MC/CMakeLists.txt
@@ -2,8 +2,6 @@
   MCAsmInfo.cpp
   MCAsmInfoCOFF.cpp
   MCAsmInfoDarwin.cpp
-  MCAsmLexer.cpp
-  MCAsmParser.cpp
   MCAsmStreamer.cpp
   MCAssembler.cpp
   MCCodeEmitter.cpp
@@ -20,5 +18,4 @@
   MCStreamer.cpp
   MCSymbol.cpp
   MCValue.cpp
-  TargetAsmParser.cpp
   )
diff --git a/lib/MC/MCAsmLexer.cpp b/lib/MC/MCParser/MCAsmLexer.cpp
similarity index 93%
rename from lib/MC/MCAsmLexer.cpp
rename to lib/MC/MCParser/MCAsmLexer.cpp
index 1e34ed6..e5b2955 100644
--- a/lib/MC/MCAsmLexer.cpp
+++ b/lib/MC/MCParser/MCAsmLexer.cpp
@@ -7,7 +7,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
 #include "llvm/Support/SourceMgr.h"
 
 using namespace llvm;
diff --git a/lib/MC/MCAsmParser.cpp b/lib/MC/MCParser/MCAsmParser.cpp
similarity index 86%
rename from lib/MC/MCAsmParser.cpp
rename to lib/MC/MCParser/MCAsmParser.cpp
index 299d005..b8c2054 100644
--- a/lib/MC/MCAsmParser.cpp
+++ b/lib/MC/MCParser/MCAsmParser.cpp
@@ -7,9 +7,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "llvm/MC/MCAsmParser.h"
-#include "llvm/MC/MCAsmLexer.h"
-#include "llvm/MC/MCParsedAsmOperand.h"
+#include "llvm/MC/MCParser/MCAsmParser.h"
+#include "llvm/MC/MCParser/MCAsmLexer.h"
+#include "llvm/MC/MCParser/MCParsedAsmOperand.h"
 #include "llvm/Support/SourceMgr.h"
 using namespace llvm;
 
diff --git a/lib/MC/TargetAsmParser.cpp b/lib/MC/MCParser/TargetAsmParser.cpp
similarity index 100%
rename from lib/MC/TargetAsmParser.cpp
rename to lib/MC/MCParser/TargetAsmParser.cpp
diff --git a/lib/MC/Makefile b/lib/MC/Makefile
index 314a5b1..a661fa6 100644
--- a/lib/MC/Makefile
+++ b/lib/MC/Makefile
@@ -10,6 +10,7 @@
 LEVEL = ../..
 LIBRARYNAME = LLVMMC
 BUILD_ARCHIVE := 1
+PARALLEL_DIRS := MCParser
 
 include $(LEVEL)/Makefile.common