Shuffling of files, better math generation