Protect a bunch of classes from vfs package.
Reformatted all the code.