minor cleanup, moved export templates in subdir. #421