move and consolidate templates