Change structure of demo