master: f01647b0744aaccf01996ec0eeb81b40b1a1df46 reorganized template