reorganizing constants and config