Cleanuo CrossCompPlacer.cs and add CrossComponentVariant2.cs