Major structuring of the app