[UPDATE] app architecture v2