WKSP-02: refactoring + add second workshop