updated structure of workshop