Restructured JSON stuff, added annotations for finer grained de-/serialization process.