Refactored adding and removing templates
Merge pull request #14 from FamousPrivateBeta/RK/scope

Refactored adding and removing templates