Significant Refactoring and using YMLs in Assets folder