Changed import paths from my fork to the conformal fork