Start moving message types into shared ns