Refactor Models into Seperate Files; Simplify JSON Formats for Models