Restructuring + pull templates remotely