Better modularisation of app code