Rework Mix Config structure to support env merging per #187