Split WYBS into separate module.