Moved templates from default to base. Clean up.