Made the expected data directories more sane.