Refactored installer to deliver demo content and fixed some warnings.