Improved app structure. Fixed app bundle including tests.