Change of JSON output and parsed blocks

Change to a category and subcategory solution instead of file.
Move file into block.