re-organized the diffusion network class