More reorg
Adding: controller for subs