Fix directory structure for workshop
Fix directory structure for workshop-st