Moved message to new package to have consistent naming