Changed POJO strructure
Changed/commented out incompatible coed in activities - Luisa/Alex to update eventually when UI matches data structure