Reorganize file naming for better clarity