Minor code reorganization.
Events and EventListeners are added to the Toolbox
EventListener support on Workspace