Fixed import statements after move