INT-3284 Refactoring around config package tangle