reorganize into a sane module
reduce noise in wil