Geometric structure in the representation theory of p-adic groups II