Move to router, and controller per module, plus data controller