diff --git a/src/cmp/cmpbackend-cxx.lsp b/src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp
similarity index 100%
rename from src/cmp/cmpbackend-cxx.lsp
rename to src/cmp/cmpbackend-cxx/cmpbackend-cxx.lsp
diff --git a/src/cmp/cmpc-inliner.lsp b/src/cmp/cmpbackend-cxx/cmpc-inliner.lsp
similarity index 100%
rename from src/cmp/cmpc-inliner.lsp
rename to src/cmp/cmpbackend-cxx/cmpc-inliner.lsp
diff --git a/src/cmp/cmpmach.lsp b/src/cmp/cmpbackend-cxx/cmpc-mach.lsp
similarity index 99%
rename from src/cmp/cmpmach.lsp
rename to src/cmp/cmpbackend-cxx/cmpc-mach.lsp
index 5c2e7e8d2..b79c57bc4 100644
--- a/src/cmp/cmpmach.lsp
+++ b/src/cmp/cmpbackend-cxx/cmpc-mach.lsp
@@ -1,4 +1,5 @@
 
+;;;;
 ;;;;  Copyright (c) 1984, Taiichi Yuasa and Masami Hagiya
 ;;;;  Copyright (c) 1990, Giuseppe Attardi
 ;;;;  Copyright (c) 2010, Juan Jose Garcia-Ripoll
diff --git a/src/cmp/cmpc-wt.lsp b/src/cmp/cmpbackend-cxx/cmpc-wt.lsp
similarity index 100%
rename from src/cmp/cmpc-wt.lsp
rename to src/cmp/cmpbackend-cxx/cmpc-wt.lsp
diff --git a/src/cmp/cmppass2-call.lsp b/src/cmp/cmpbackend-cxx/cmppass2-call.lsp
similarity index 100%
rename from src/cmp/cmppass2-call.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-call.lsp
diff --git a/src/cmp/cmppass2-cont.lsp b/src/cmp/cmpbackend-cxx/cmppass2-cont.lsp
similarity index 100%
rename from src/cmp/cmppass2-cont.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-cont.lsp
diff --git a/src/cmp/cmppass2-data.lsp b/src/cmp/cmpbackend-cxx/cmppass2-data.lsp
similarity index 100%
rename from src/cmp/cmppass2-data.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-data.lsp
diff --git a/src/cmp/cmppass2-eval.lsp b/src/cmp/cmpbackend-cxx/cmppass2-eval.lsp
similarity index 100%
rename from src/cmp/cmppass2-eval.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-eval.lsp
diff --git a/src/cmp/cmppass2-exit.lsp b/src/cmp/cmpbackend-cxx/cmppass2-exit.lsp
similarity index 100%
rename from src/cmp/cmppass2-exit.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-exit.lsp
diff --git a/src/cmp/cmppass2-ffi.lsp b/src/cmp/cmpbackend-cxx/cmppass2-ffi.lsp
similarity index 100%
rename from src/cmp/cmppass2-ffi.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-ffi.lsp
diff --git a/src/cmp/cmppass2-fun.lsp b/src/cmp/cmpbackend-cxx/cmppass2-fun.lsp
similarity index 100%
rename from src/cmp/cmppass2-fun.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-fun.lsp
diff --git a/src/cmp/cmppass2-loc.lsp b/src/cmp/cmpbackend-cxx/cmppass2-loc.lsp
similarity index 100%
rename from src/cmp/cmppass2-loc.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-loc.lsp
diff --git a/src/cmp/cmppass2-special.lsp b/src/cmp/cmpbackend-cxx/cmppass2-special.lsp
similarity index 100%
rename from src/cmp/cmppass2-special.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-special.lsp
diff --git a/src/cmp/cmppass2-stack.lsp b/src/cmp/cmpbackend-cxx/cmppass2-stack.lsp
similarity index 100%
rename from src/cmp/cmppass2-stack.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-stack.lsp
diff --git a/src/cmp/cmppass2-top.lsp b/src/cmp/cmpbackend-cxx/cmppass2-top.lsp
similarity index 100%
rename from src/cmp/cmppass2-top.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-top.lsp
diff --git a/src/cmp/cmppass2-var.lsp b/src/cmp/cmpbackend-cxx/cmppass2-var.lsp
similarity index 100%
rename from src/cmp/cmppass2-var.lsp
rename to src/cmp/cmpbackend-cxx/cmppass2-var.lsp
diff --git a/src/cmp/load.lsp.in b/src/cmp/load.lsp.in
index 160d3f7d1..92e6f799b 100644
--- a/src/cmp/load.lsp.in
+++ b/src/cmp/load.lsp.in
@@ -10,7 +10,6 @@
     "src:cmp;cmptype-arith.lsp"
     "src:cmp;cmppolicy.lsp"
     ;; Internal representation
-    "src:cmp;cmpmach.lsp"
     "src:cmp;cmprefs.lsp"
     "src:cmp;cmplocs.lsp"
     ;; Environment
@@ -32,9 +31,6 @@
     "src:cmp;cmptype-prop.lsp"
     "src:cmp;cmptype.lsp"
     "src:cmp;cmptype-assert.lsp"
-    ;; Abstract C machine
-    "src:cmp;cmpc-wt.lsp"
-    "src:cmp;cmpc-inliner.lsp"
     ;; AST building pass
     "src:cmp;cmppass1-data.lsp"
     "src:cmp;cmppass1-top.lsp"
@@ -48,19 +44,25 @@
     "src:cmp;cmppass1-ffi.lsp"
     ;; Type propagation pass
     "src:cmp;cmpprop.lsp"
+    ;; C/C++ backend
+    ;; Abstract C machine
+    "src:cmp;cmpbackend-cxx;cmpc-mach.lsp"
+    "src:cmp;cmpbackend-cxx;cmpc-wt.lsp"
+    "src:cmp;cmpbackend-cxx;cmpc-inliner.lsp"
     ;; Code generation pass
-    "src:cmp;cmppass2-data.lsp"
-    "src:cmp;cmppass2-top.lsp"
-    "src:cmp;cmppass2-stack.lsp"
-    "src:cmp;cmppass2-special.lsp"
-    "src:cmp;cmppass2-exit.lsp"
-    "src:cmp;cmppass2-cont.lsp"
-    "src:cmp;cmppass2-eval.lsp"
-    "src:cmp;cmppass2-call.lsp"
-    "src:cmp;cmppass2-var.lsp"
-    "src:cmp;cmppass2-loc.lsp"
-    "src:cmp;cmppass2-fun.lsp"
-    "src:cmp;cmppass2-ffi.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-data.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-top.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-stack.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-special.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-exit.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-cont.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-eval.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-call.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-var.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-loc.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-fun.lsp"
+    "src:cmp;cmpbackend-cxx;cmppass2-ffi.lsp"
+    "src:cmp;cmpbackend-cxx;cmpbackend-cxx.lsp"
     ;; Optimizations
     "src:cmp;cmpct.lsp"
     "src:cmp;cmpmap.lsp"
@@ -81,7 +83,6 @@
     ;; Other
     "src:cmp;cmpos-run.lsp"
     "src:cmp;cmpos-features.lsp"
-    "src:cmp;cmpbackend-cxx.lsp"
     "src:cmp;cmpmain.lsp"
     "src:cmp;proclamations.lsp"))