Moved parts from workbench root to core module