moved waitstrategy to own subnamespace