Revert "Revert "re-added CMFileManager""

This reverts commit 3af0e55eea6fa068b0dde0b2073ac11d2084ad47.