Replace three file related helpers with one component instead