Consolidate yml files