progress on auto-fill existing packages, bit more refactoring