changed structure of app