Reverted to sub apps, that are added to the main app
Merge branch 'sub-apps-again'