wiigee submodule and refactor