Added journal template and improved templates structure