updated package.js to new file structure
added templating to package dependencies
Merge branch 'newfilestruct'
solve conflict
Quick fixes
more changes
Merge remote-tracking branch 'original/master'

pulled in upstream changes