Move json files to their own directory, put minified objects in index as text, edit initializing conditional, styling
Resolve merge conflicts