Update stubmodule reference to make travis run all tests

move some packages around as well. and popup clicky.