Convert to better config layout