Reorganisation of the app