Reorganized functions in packages