Moved to item.tf

Refactored templates
Bumped version to 3-9