refactored less files
Merge branch 'ray'