diff --git a/lib/StaticAnalyzer/AnalysisConsumer.cpp b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
similarity index 99%
rename from lib/StaticAnalyzer/AnalysisConsumer.cpp
rename to lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
index f8a2319..ee4eae2 100644
--- a/lib/StaticAnalyzer/AnalysisConsumer.cpp
+++ b/lib/StaticAnalyzer/Checkers/AnalysisConsumer.cpp
@@ -30,8 +30,8 @@
 #include "clang/StaticAnalyzer/PathDiagnosticClients.h"
 
 // FIXME: Restructure checker registration.
-#include "Checkers/ExprEngineExperimentalChecks.h"
-#include "Checkers/ExprEngineInternalChecks.h"
+#include "ExprEngineExperimentalChecks.h"
+#include "ExprEngineInternalChecks.h"
 
 #include "clang/Basic/FileManager.h"
 #include "clang/Basic/SourceManager.h"
diff --git a/lib/StaticAnalyzer/ExprEngine.cpp b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
similarity index 99%
rename from lib/StaticAnalyzer/ExprEngine.cpp
rename to lib/StaticAnalyzer/Checkers/ExprEngine.cpp
index 0ae02d8..ca96014 100644
--- a/lib/StaticAnalyzer/ExprEngine.cpp
+++ b/lib/StaticAnalyzer/Checkers/ExprEngine.cpp
@@ -14,7 +14,7 @@
 //===----------------------------------------------------------------------===//
 
 // FIXME: Restructure checker registration.
-#include "Checkers/ExprEngineInternalChecks.h"
+#include "ExprEngineInternalChecks.h"
 
 #include "clang/StaticAnalyzer/BugReporter/BugType.h"
 #include "clang/StaticAnalyzer/PathSensitive/AnalysisManager.h"