Restructured to new class arrangement