Further consolidate files