Move package of infrastructure classes