Fix project hierarchy errors. Improve sample app UX.