Initial WIP draft of splitted templates