namespacing templates + delete old templates that were not properly namespaced