Update file structure for gem
Merge branch 'test-gem' into develop