Merge "Move C2HandleIon and C2AllocationIon to internal dir"