Move command buses to base controller
Add event listener setup