Improve naming and bundle setup
Merge pull request #2 from NSElvis/improve/model-naming

Improve naming and bundle setup