Proper JSON module info files
Merge branch 'temp'