started changing directory structure to gem
Merge branch 'ray' into develop