Merge "move json from code to indepandent file"