Changed import statements to match new package configuration