Done some refactoring on nfilesystem so it made sense