Refactor Import File operations