Move more classes to Infrastructure.