YBR app updated , refactored package