re organize gem structure
Merge branch 'develop'