Changed structure of app.