Revert "CS File V2"

This reverts commit 25c965dc5d2ad16399653aa3422c008b2696357d.
Revert "Revert "CS File V2""

This reverts commit 0d814b3a83e3065b845f1357459697ff46e509e9.