Fix import statements to match refactored packages