Scary reorganization of services into stweet-related services. But it seems to work just fine.