Cleanup imports (grrr, intellij)
Started sketching out proper Json Format for models