cleaning up
join msgs and srvs package