Removed structure that needed beans. Made all controllers implement
action listener. Renamed some classes to be less ambiguous.