removing add package code, migrating these functions to cdist
removing add package code, migrating these functions to cdist
reorganization, nothing too important
removing add package code, migrating these functions to cdist