continued refactor for wiigee submodule