[UPDATE] app architecture