Merged all repos.yaml and config.rb fixes from -source, also deleted old folders