Slight refactoring. Intial file-system class.