mock data updated
Language handling moved in a service encapsulated in a new module