bunch of relative imports
vendor more imports
fix sip imports
finish vendoring
merge master; resolve conflicts