Refactor some configuration into separate files