Support nested template names
Remove old files