Yeah, that works, but it's a hassle. Really hope they fix this soon.You can manually change the order of songs within a folder. Press edit, then you will see on the right of every file three lines. Press and hold the three lines, this will allow you to move the files up or down.