Refactor package-specific settings (#622)