Remove xptemplate
Add separated bundle