Re-factory files