Move files into 'workshop' package. Move helper test factory to helper package.