FileSys cleanup

Clean up according to the coding style, and remove redundant namespaced names.
Woops, that shouldn’t have been here at all.