reorganize templates a bit according to new namespace feature;