Combine individual package and all package functionality; some refactor.