Rename model files
Add json go tags
Cosmetic changes