Re: reorganizing constants and config