Remove and rearrange some template files