Applied Configuration refactoring's structural changes to refactorings made for #9