Some templates rewritten, moved or removed

This closes #66