[JBTM-2308] Mark classes deprecated since we need to rejig package names