Main JSON integration

Converted new base files to JSON implementation.