Updating readme
Importing templates correctly
Removing dead code