Move fs importer to own module