So all the souls are still the the grave?And unbelievers and believers are both in hades?
Yes. They are both in the grave/Hades. Hades is Greek for grave.
Believers are resurrected at the first resurrection and nonbelievers at the great white throne judgment.