Organized tempaltes dirs a little bit