Changed structure of the app