Clean up JSON folder

Removed a bunch of redundant or old JSONs.
Renamed the template working copies.
JSON housecleaning

Added the trailing slash to the webroot of the timestreams JSON.
Reorganised the timestreams JSON to be more readable.
Merge branch 'master' into upstream