Fixing imports according to godep