kr 1
WIP package refactor

 * fix imports
kr 2
Merge remote-tracking branch 'jwhonce/wip/refactor' into refactor
kr 3
kr 4
Merge pull request #2 from pmorie/refactor

Move integration tests
WIP geard packaging
Merge pull request #3 from jwhonce/wip/refactor

WIP geard packaging
WIP geard refactor packaging
Fixes to jobs