Moved some user templates to their own components folders