Changed file naming and sorting