model.js template now uses this rather than self
Fixed folder includes in package.json