Rename models and improve fixtutes
Merge pull request #4 from cremalab/models

Rename models and improve fixtutes