Reorganize CPack management