move hbs
Merge pull request #1281 from Tendrid/projects/jnap

move hbs
Merge