Move services to their packages.
Fix spontaneous resume on message sound.