Updated roster, and removed roster.js separate file