Templates moved from core to add directory