rework structure
templates