refactoring resource files, unused resource removed.
refactoring resource files, unused resource removed.
Merged changes from dev