Changing structure of app, n stuff