Move more modules under Signal