Try to organize & cleanup. Add Networks controller