Port the file module over to the new common code infrastructure + cleanup some redundant imports since the module code already imports those things.