#6 : Move controller to own package + create selector panel.