Split controllers into two seperate modules