[UPDATE] App architecture