Significant refactor of module

I just noticed that this is in the .travis.yml. It makes more sense now.