FileSystem refactoring.
Further FileSystem refactoring.
License header comments.