[API] classes renamed and moved