Some structal changes

Also added grooveshark and itunes links