Put config object in a more logical place