Moved JSON into separate sub-module