changed structure demo app