Hard rock had been established as a mainstream genre by 1965. Along with soft rock, what type of music made up mainstream rock music in the late 1960s?