Relocate internal classes