Split out demo in seprate project