Marked classes as deprecated, as they have moved to sbutil