Refactor to use a light instance manager
Add missing files
Merge branch 'master' into gh-pages