Move template to proper dir structure
Refactor actions into appropriate recipes