FileSys cleanup

Clean up according to the coding style, and remove redundant namespaced names.
Eh... I think it's clearer to leave this in the constructor.