Update test app to match new app folder structure.
Updated base url parsing to account for app's folder structure changes.
Merge pull request #2646 from ADmad/3.0-app-structure-2

3.0 app structure 2