Making templates more generic for distribution
Updating readme