extraction refactoring file and dir modules