FileSys cleanup

Clean up according to the coding style, remove redundant namespaced names, and economise up to 16 bytes per path by putting the storage objects in an union.