rearrange template files
Add Facet blocks
Merge pull request #26 from smirfolio/master

rearrange template files