FileSys cleanup

Clean up according to the coding style, and remove redundant namespaced names.