Moving templates from main to components