Removed /Template and all associated @namespaces - moved templates to /Basic