Repackaging some classes