Added templates
renamed
renamed