slowly nibbling away all the old classes and converting it to new sw struct