Add remaining DisplayData models
Simplify model package

-Use nested classes wherever possible for GSON