Replace with single class imports