itunes & ocd

i think im gonna upgrade my itunes. one problem is i have ocd when it comes to organizing my library. ive neglected it for months. since im about to get a new ipod and hopefully a computer soon. im gonna remove everything and start over. every album i add im gonna do all the tags correctly. its gonna be a long process since i have over 30,000 songs.