diff --git a/tools/llvmc2/Makefile b/tools/llvmc2/Makefile
index 89a21bcb379..3012065e4ca 100644
--- a/tools/llvmc2/Makefile
+++ b/tools/llvmc2/Makefile
@@ -11,7 +11,7 @@ LEVEL = ../..
 
 BUILTIN_PLUGINS = Base
 DRIVER_NAME = llvmc2
-DIRS = plugins core
+DIRS = plugins driver 
 
 export BUILTIN_PLUGINS
 export DRIVER_NAME
diff --git a/tools/llvmc2/core/Action.cpp b/tools/llvmc2/driver/Action.cpp
similarity index 100%
rename from tools/llvmc2/core/Action.cpp
rename to tools/llvmc2/driver/Action.cpp
diff --git a/tools/llvmc2/core/CompilationGraph.cpp b/tools/llvmc2/driver/CompilationGraph.cpp
similarity index 100%
rename from tools/llvmc2/core/CompilationGraph.cpp
rename to tools/llvmc2/driver/CompilationGraph.cpp
diff --git a/tools/llvmc2/core/Error.h b/tools/llvmc2/driver/Error.h
similarity index 100%
rename from tools/llvmc2/core/Error.h
rename to tools/llvmc2/driver/Error.h
diff --git a/tools/llvmc2/core/Makefile b/tools/llvmc2/driver/Makefile
similarity index 100%
rename from tools/llvmc2/core/Makefile
rename to tools/llvmc2/driver/Makefile
diff --git a/tools/llvmc2/core/Plugin.cpp b/tools/llvmc2/driver/Plugin.cpp
similarity index 100%
rename from tools/llvmc2/core/Plugin.cpp
rename to tools/llvmc2/driver/Plugin.cpp
diff --git a/tools/llvmc2/core/llvmc.cpp b/tools/llvmc2/driver/llvmc.cpp
similarity index 100%
rename from tools/llvmc2/core/llvmc.cpp
rename to tools/llvmc2/driver/llvmc.cpp