consolidated templates and renamed

* Integrated free/paid together DRY
* named to slugs, removed 'new' naming convention