Revert "moved wsare_srv from the Toolkit"

This reverts commit ebe0d8e45bb9261f291248cf4af92546fbc01ab2.