More refactoring = shorter import path / more go get-able
More refactoring = shorter import path / more go get-able 2
More refactoring = shorter import path / more go get-able 3
This should improve testing speed