Changing layout of config and updating recipes for final install