More refactorings in the move project on file system part.