reorganized folders for demo app