CLDIDE-2160 adopt to the new package locations