- move WSD code to WSI package