Put all messages into separate package

Change-Id: If519f36515e2125238ee9b531fe7ad896d11915f