Finish demo app
Finish demo app in main folder