Message & MessageSource moved to the api module