Json infrastructure moved back here, configuration moved to commons