Modularised the app