Yet more refactoring.
Turning wyfs and wybs back into standalone plugins.