diff --git a/boot/environ/lib/io/etfs.c b/boot/environ/lib/io/etfs.c
index 8d8797b01b0..da5ee0f8654 100644
--- a/boot/environ/lib/io/etfs.c
+++ b/boot/environ/lib/io/etfs.c
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 #include <bl.h>
-#include <cdfs_new/cd.h>
+#include <cdfs/cd.h>
 typedef struct _RAW_ET_VD
 {
     UCHAR BootIndicator;
diff --git a/drivers/filesystems/cdfs_new/CMakeLists.txt b/drivers/filesystems/cdfs/CMakeLists.txt
similarity index 100%
rename from drivers/filesystems/cdfs_new/CMakeLists.txt
rename to drivers/filesystems/cdfs/CMakeLists.txt
diff --git a/drivers/filesystems/cdfs_new/LICENSE b/drivers/filesystems/cdfs/LICENSE
similarity index 100%
rename from drivers/filesystems/cdfs_new/LICENSE
rename to drivers/filesystems/cdfs/LICENSE
diff --git a/drivers/filesystems/cdfs_new/README.md b/drivers/filesystems/cdfs/README.md
similarity index 100%
rename from drivers/filesystems/cdfs_new/README.md
rename to drivers/filesystems/cdfs/README.md
diff --git a/drivers/filesystems/cdfs_new/allocsup.c b/drivers/filesystems/cdfs/allocsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/allocsup.c
rename to drivers/filesystems/cdfs/allocsup.c
diff --git a/drivers/filesystems/cdfs_new/cachesup.c b/drivers/filesystems/cdfs/cachesup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/cachesup.c
rename to drivers/filesystems/cdfs/cachesup.c
diff --git a/drivers/filesystems/cdfs_new/cd.h b/drivers/filesystems/cdfs/cd.h
similarity index 100%
rename from drivers/filesystems/cdfs_new/cd.h
rename to drivers/filesystems/cdfs/cd.h
diff --git a/drivers/filesystems/cdfs_new/cddata.c b/drivers/filesystems/cdfs/cddata.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/cddata.c
rename to drivers/filesystems/cdfs/cddata.c
diff --git a/drivers/filesystems/cdfs_new/cddata.h b/drivers/filesystems/cdfs/cddata.h
similarity index 100%
rename from drivers/filesystems/cdfs_new/cddata.h
rename to drivers/filesystems/cdfs/cddata.h
diff --git a/drivers/filesystems/cdfs_new/cdfs.rc b/drivers/filesystems/cdfs/cdfs.rc
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdfs.rc
rename to drivers/filesystems/cdfs/cdfs.rc
diff --git a/drivers/filesystems/cdfs_new/cdfs_reg.inf b/drivers/filesystems/cdfs/cdfs_reg.inf
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdfs_reg.inf
rename to drivers/filesystems/cdfs/cdfs_reg.inf
diff --git a/drivers/filesystems/cdfs_new/cdinit.c b/drivers/filesystems/cdfs/cdinit.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdinit.c
rename to drivers/filesystems/cdfs/cdinit.c
diff --git a/drivers/filesystems/cdfs_new/cdprocs.h b/drivers/filesystems/cdfs/cdprocs.h
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdprocs.h
rename to drivers/filesystems/cdfs/cdprocs.h
diff --git a/drivers/filesystems/cdfs_new/cdprocssrc.c b/drivers/filesystems/cdfs/cdprocssrc.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdprocssrc.c
rename to drivers/filesystems/cdfs/cdprocssrc.c
diff --git a/drivers/filesystems/cdfs_new/cdstruc.h b/drivers/filesystems/cdfs/cdstruc.h
similarity index 100%
rename from drivers/filesystems/cdfs_new/cdstruc.h
rename to drivers/filesystems/cdfs/cdstruc.h
diff --git a/drivers/filesystems/cdfs_new/cleanup.c b/drivers/filesystems/cdfs/cleanup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/cleanup.c
rename to drivers/filesystems/cdfs/cleanup.c
diff --git a/drivers/filesystems/cdfs_new/close.c b/drivers/filesystems/cdfs/close.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/close.c
rename to drivers/filesystems/cdfs/close.c
diff --git a/drivers/filesystems/cdfs_new/create.c b/drivers/filesystems/cdfs/create.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/create.c
rename to drivers/filesystems/cdfs/create.c
diff --git a/drivers/filesystems/cdfs_new/devctrl.c b/drivers/filesystems/cdfs/devctrl.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/devctrl.c
rename to drivers/filesystems/cdfs/devctrl.c
diff --git a/drivers/filesystems/cdfs_new/deviosup.c b/drivers/filesystems/cdfs/deviosup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/deviosup.c
rename to drivers/filesystems/cdfs/deviosup.c
diff --git a/drivers/filesystems/cdfs_new/dirctrl.c b/drivers/filesystems/cdfs/dirctrl.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/dirctrl.c
rename to drivers/filesystems/cdfs/dirctrl.c
diff --git a/drivers/filesystems/cdfs_new/dirsup.c b/drivers/filesystems/cdfs/dirsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/dirsup.c
rename to drivers/filesystems/cdfs/dirsup.c
diff --git a/drivers/filesystems/cdfs_new/fieldoff.c b/drivers/filesystems/cdfs/fieldoff.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/fieldoff.c
rename to drivers/filesystems/cdfs/fieldoff.c
diff --git a/drivers/filesystems/cdfs_new/fileinfo.c b/drivers/filesystems/cdfs/fileinfo.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/fileinfo.c
rename to drivers/filesystems/cdfs/fileinfo.c
diff --git a/drivers/filesystems/cdfs_new/filobsup.c b/drivers/filesystems/cdfs/filobsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/filobsup.c
rename to drivers/filesystems/cdfs/filobsup.c
diff --git a/drivers/filesystems/cdfs_new/fsctrl.c b/drivers/filesystems/cdfs/fsctrl.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/fsctrl.c
rename to drivers/filesystems/cdfs/fsctrl.c
diff --git a/drivers/filesystems/cdfs_new/fspdisp.c b/drivers/filesystems/cdfs/fspdisp.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/fspdisp.c
rename to drivers/filesystems/cdfs/fspdisp.c
diff --git a/drivers/filesystems/cdfs_new/lockctrl.c b/drivers/filesystems/cdfs/lockctrl.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/lockctrl.c
rename to drivers/filesystems/cdfs/lockctrl.c
diff --git a/drivers/filesystems/cdfs_new/namesup.c b/drivers/filesystems/cdfs/namesup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/namesup.c
rename to drivers/filesystems/cdfs/namesup.c
diff --git a/drivers/filesystems/cdfs_new/nodetype.h b/drivers/filesystems/cdfs/nodetype.h
similarity index 100%
rename from drivers/filesystems/cdfs_new/nodetype.h
rename to drivers/filesystems/cdfs/nodetype.h
diff --git a/drivers/filesystems/cdfs_new/pathsup.c b/drivers/filesystems/cdfs/pathsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/pathsup.c
rename to drivers/filesystems/cdfs/pathsup.c
diff --git a/drivers/filesystems/cdfs_new/pnp.c b/drivers/filesystems/cdfs/pnp.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/pnp.c
rename to drivers/filesystems/cdfs/pnp.c
diff --git a/drivers/filesystems/cdfs_new/prefxsup.c b/drivers/filesystems/cdfs/prefxsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/prefxsup.c
rename to drivers/filesystems/cdfs/prefxsup.c
diff --git a/drivers/filesystems/cdfs_new/read.c b/drivers/filesystems/cdfs/read.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/read.c
rename to drivers/filesystems/cdfs/read.c
diff --git a/drivers/filesystems/cdfs_new/resrcsup.c b/drivers/filesystems/cdfs/resrcsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/resrcsup.c
rename to drivers/filesystems/cdfs/resrcsup.c
diff --git a/drivers/filesystems/cdfs_new/shutdown.c b/drivers/filesystems/cdfs/shutdown.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/shutdown.c
rename to drivers/filesystems/cdfs/shutdown.c
diff --git a/drivers/filesystems/cdfs_new/strucsup.c b/drivers/filesystems/cdfs/strucsup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/strucsup.c
rename to drivers/filesystems/cdfs/strucsup.c
diff --git a/drivers/filesystems/cdfs_new/verfysup.c b/drivers/filesystems/cdfs/verfysup.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/verfysup.c
rename to drivers/filesystems/cdfs/verfysup.c
diff --git a/drivers/filesystems/cdfs_new/volinfo.c b/drivers/filesystems/cdfs/volinfo.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/volinfo.c
rename to drivers/filesystems/cdfs/volinfo.c
diff --git a/drivers/filesystems/cdfs_new/workque.c b/drivers/filesystems/cdfs/workque.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/workque.c
rename to drivers/filesystems/cdfs/workque.c
diff --git a/drivers/filesystems/cdfs_new/write.c b/drivers/filesystems/cdfs/write.c
similarity index 100%
rename from drivers/filesystems/cdfs_new/write.c
rename to drivers/filesystems/cdfs/write.c