Added settings yaml file and removed other setting files
Moved settings to single file
Made CR changes