WIP: package config refactoring