Replace package classes with OS classes