Reorganise make tasks
Add template engine
Fix permanent build