Changed structure of app