Use the correct import paths for the new package