* reorganize some templates into subdirectories