Moved templates from default to base