Adding usings of the renamed and relocated classes