Separated controllers from ActionListeners.
Minor model update.
Updated autowired components qualifier names.