reshuffled package names, added CPD