Moving config options to a separate file is a good idea. We could think about the clean up work later.