Start moving common variables into config module