re-structured config - grouped defines together