Moved messages, etc under secondary.

Signed-off-by: Joe Whitsitt <joe-whitsitt@uiowa.edu>