refractored Workbench and clean up worker classes