diff --git a/passes/cmds/Makefile.inc b/passes/cmds/Makefile.inc
index 5ee82975..7638f600 100644
--- a/passes/cmds/Makefile.inc
+++ b/passes/cmds/Makefile.inc
@@ -13,4 +13,5 @@ OBJS += passes/cmds/stat.o
 OBJS += passes/cmds/setattr.o
 OBJS += passes/cmds/copy.o
 OBJS += passes/cmds/splice.o
+OBJS += passes/cmds/scc.o
 
diff --git a/passes/scc/scc.cc b/passes/cmds/scc.cc
similarity index 100%
rename from passes/scc/scc.cc
rename to passes/cmds/scc.cc
diff --git a/passes/extract/Makefile.inc b/passes/extract/Makefile.inc
deleted file mode 100644
index 5ef88a34..00000000
--- a/passes/extract/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-OBJS += passes/extract/extract.o
-
diff --git a/passes/hierarchy/Makefile.inc b/passes/hierarchy/Makefile.inc
index 37cc287a..99aa1e11 100644
--- a/passes/hierarchy/Makefile.inc
+++ b/passes/hierarchy/Makefile.inc
@@ -1,3 +1,4 @@
 
 OBJS += passes/hierarchy/hierarchy.o
+OBJS += passes/hierarchy/submod.o
 
diff --git a/passes/submod/submod.cc b/passes/hierarchy/submod.cc
similarity index 100%
rename from passes/submod/submod.cc
rename to passes/hierarchy/submod.cc
diff --git a/passes/scc/Makefile.inc b/passes/scc/Makefile.inc
deleted file mode 100644
index ca86e6e5..00000000
--- a/passes/scc/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-OBJS += passes/scc/scc.o
-
diff --git a/passes/submod/Makefile.inc b/passes/submod/Makefile.inc
deleted file mode 100644
index b0c00eae..00000000
--- a/passes/submod/Makefile.inc
+++ /dev/null
@@ -1,3 +0,0 @@
-
-OBJS += passes/submod/submod.o
-
diff --git a/passes/techmap/Makefile.inc b/passes/techmap/Makefile.inc
index 9751a474..ae1ebbb5 100644
--- a/passes/techmap/Makefile.inc
+++ b/passes/techmap/Makefile.inc
@@ -5,6 +5,7 @@ OBJS += passes/techmap/dfflibmap.o
 OBJS += passes/techmap/iopadmap.o
 OBJS += passes/techmap/hilomap.o
 OBJS += passes/techmap/libparse.o
+OBJS += passes/techmap/extract.o
 
 GENFILES += passes/techmap/stdcells.inc
 
diff --git a/passes/extract/extract.cc b/passes/techmap/extract.cc
similarity index 100%
rename from passes/extract/extract.cc
rename to passes/techmap/extract.cc