FileSys: Clean up according to the coding style, and remove redundant namespaced names.
Merge pull request #303 from linkmauve/fs-cleanup

FileSys cleanup