Cleaning up demoApp.
Renames modules.
Renames modules.
Merge branch 'develop'

* develop:
  Renames modules.
  Renames modules.
  Cleaning up demoApp.