Added more messages; split messages file; removed context structure.