add zsrkmyn's templates branch to subdirectory
revise templates