Added templates structure
Added new feature, to remeber