Moving more static classes to services