- improve demo module packaging