restructured project to separate demo app