Consolidate filesystem imports, remove unneeded imports elsewhere