fix import paths until this gets merged into official repo