Finish demo app with new files