Re organized templates folder