Improving the structure of the app