Improve adding packages to repo, handles split packages