Refactor - keep the config module on a separate file