More file consolidation