Continue extracting message types into shared ns

Move pahse4 into shared ns.
Combine message ns for simplicity