Simplify default templates; add old templates in separate file for backward compatibility