[Cleanup] moved deprecated classes