Refactor wlc, api breakage \o/.