Restructuring of templating stuff continued