Refactoring of BBC and Angular Front End