Redid some classes and other structures