add workshop and restructure