move tsd to separate ns