mp3 or 4

I've bought a new phone, a Samsung Galaxy SII. On my previous Samsung i8910 phone, I had real problems organising the music files. They were all over the place and difficult to access easily. Is there a music sorting product available to use with my new handset that will make finding and...