More efficient set of files
Increase AJAX timeout value
Reflect recent changes in folders
Misc changes suggested by TypeScript analysis
Merge branch 'master' into converter