Re-organisation of app