Shuffled files for easier RPM build