Starting to organise the templates