Update: move .html to .hbs (part 2, done)