updated package.js to new file structure
added templating to package dependencies
Merge branch 'newfilestruct'
solve conflict