Remove hardcoded app folder

Allows changing app folder name
Merge pull request #5941 from acasar/master

Remove hardcoded app folder