restructure, plus some more network architecture