Move messages data to a separate file