CRM-17149 separation of concerns - move uf specific code to uf classes